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

1 files changed, 3 insertions, 7 deletions

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 6b16f550d9..ddb2fbf012 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.List;
 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 @@ public class UploadPack {
 		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 @@ public class UploadPack {
 		}
 
 		void stopBuffering() throws IOException {
-			if (buffer != null) {
-				buffer.writeTo(rawOut);
-				buffer = null;
+			if (out != rawOut) {
+				((ByteArrayOutputStream) out).writeTo(rawOut);
 				out = rawOut;
 			}
 		}