Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce2011-05-27 20:35:18 +0000
committerShawn O. Pearce2011-06-10 00:29:46 +0000
commit7ff6eb584cf8b83f83a3b5edf897feb53dbf42c0 (patch)
treebcee711b89ef4e348c8ce977323c3baf7e49f44a /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
parent1a87a725be28cb33f370bb62db69ae672a64c56b (diff)
downloadjgit-7ff6eb584cf8b83f83a3b5edf897feb53dbf42c0.tar.gz
jgit-7ff6eb584cf8b83f83a3b5edf897feb53dbf42c0.tar.xz
jgit-7ff6eb584cf8b83f83a3b5edf897feb53dbf42c0.zip
Push errors back over sideband when possible
If an internal exception occurs while packing and the request needs to abort, the HTTP response might already be committed due to progress message having already been delivered to the client. This prevents UploadPackServlet from resetting the response and sending back an HTTP 500 response. Try to catch all exceptions and report internal errors over the sideband stream or as an ERR command during the initial ACK/NAK negotiation phase. This allows JGit to transmit an error message that the user will receive on their console without needing to worry about resetting the (already gone) HTTP response. Change-Id: Ie393fb8bb55d2b79ab1276adf71c781c1807f9fe Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
index c0f7a1479c..7054cf800f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -284,6 +284,7 @@ public class JGitText extends TranslationBundle {
/***/ public String indexWriteException;
/***/ public String integerValueOutOfRange;
/***/ public String internalRevisionError;
+ /***/ public String internalServerError;
/***/ public String interruptedWriting;
/***/ public String inTheFuture;
/***/ public String invalidAdvertisementOf;

Back to the top