Merge branch 'stable-5.5' into stable-5.6

* stable-5.5:
  Fix API problem filters
  Fix unclosed resource warning in SmartOutputStream
  JschConfigSessionFactory: fix boxing warning
  SshSupport#runSshCommand: don't throw exception in finally block
  Don't override already managed maven-compiler-plugin version
  Remove unused import from CreateFileSnapshotBenchmark
  Remove duplicate ignore_optional_problems entry in .classpath
  Update maven-site-plugin used by benchmark module to 3.8.2
  Add dependency to enable site generation for benchmark module
  Ignore warnings for generated source code in
org.eclipse.jgit.benchmark
  Fix MBean registration
  Enhance WindowCache statistics

Change-Id: I11f9a387ac3dc7d22a4f2e70bb8d89169b4e9afe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 16 insertions, 15 deletions

diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java
index 06bdce679d..0dfaec2567 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java
@@ -105,18 +105,16 @@ class SmartOutputStream extends TemporaryBuffer {
 			// If output hasn't started yet, the entire thing fit into our
 			// buffer. Try to use a proper Content-Length header, and also
 			// deflate the response with gzip if it will be smaller.
-			@SuppressWarnings("resource")
-			TemporaryBuffer out = this;
-
-			if (256 < out.length() && acceptsGzipEncoding(req)) {
+			if (256 < this.length() && acceptsGzipEncoding(req)) {
 				TemporaryBuffer gzbuf = new TemporaryBuffer.Heap(LIMIT);
 				try {
 					try (GZIPOutputStream gzip = new GZIPOutputStream(gzbuf)) {
-						out.writeTo(gzip, null);
+						this.writeTo(gzip, null);
 					}
-					if (gzbuf.length() < out.length()) {
-						out = gzbuf;
+					if (gzbuf.length() < this.length()) {
 						rsp.setHeader(HDR_CONTENT_ENCODING, ENCODING_GZIP);
+						writeResponse(gzbuf);
+						return;
 					}
 				} catch (IOException err) {
 					// Most likely caused by overflowing the buffer, meaning
@@ -124,15 +122,18 @@ class SmartOutputStream extends TemporaryBuffer {
 					// copy and use the original.
 				}
 			}
+			writeResponse(this);
+		}
+	}
 
-			// The Content-Length cannot overflow when cast to an int, our
-			// hardcoded LIMIT constant above assures us we wouldn't store
-			// more than 2 GiB of content in memory.
-			rsp.setContentLength((int) out.length());
-			try (OutputStream os = rsp.getOutputStream()) {
-				out.writeTo(os, null);
-				os.flush();
-			}
+	private void writeResponse(TemporaryBuffer out) throws IOException {
+		// The Content-Length cannot overflow when cast to an int, our
+		// hardcoded LIMIT constant above assures us we wouldn't store
+		// more than 2 GiB of content in memory.
+		rsp.setContentLength((int) out.length());
+		try (OutputStream os = rsp.getOutputStream()) {
+			out.writeTo(os, null);
+			os.flush();
 		}
 	}
 }