commit ace9e4305af2ef5a26f3da86d45377e4b33982c4
author Andrey Loskutov <loskutov@gmx.de> Wed Apr 05 07:53:24 2017 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Wed Apr 05 07:53:26 2017 -0400
tree ce21b2fad3f1aecebbe7f06f342d733ba8676aeb
parent db8b2c4288458769c71226b11479940b6723c72d
parent 7476baebfc457e75c984de61dc8ae08a359b52e8

Merge "Fixed NP dereference error reported by ecj in UploadPack.stopBuffering()"

org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
index 6b16f55..ddb2fbf 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
@@ -72,7 +72,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.jgit.annotations.Nullable;
 import org.eclipse.jgit.errors.CorruptObjectException;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
@@ -1588,12 +1587,10 @@
 		private final OutputStream rawOut;
 
 		private OutputStream out;
-		@Nullable
-		private ByteArrayOutputStream buffer;
 
 		ResponseBufferedOutputStream(OutputStream rawOut) {
 			this.rawOut = rawOut;
-			this.out = this.buffer = new ByteArrayOutputStream();
+			this.out = new ByteArrayOutputStream();
 		}
 
 		@Override
@@ -1622,9 +1619,8 @@
 		}
 
 		void stopBuffering() throws IOException {
-			if (buffer != null) {
-				buffer.writeTo(rawOut);
-				buffer = null;
+			if (out != rawOut) {
+				((ByteArrayOutputStream) out).writeTo(rawOut);
 				out = rawOut;
 			}
 		}