Merge "Cleanup possiblyFilteredInputStream() in WorkingTreeIterator"

org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@@ -335,11 +335,11 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
 
 	private InputStream possiblyFilteredInputStream(final Entry e,
 			final InputStream is, final long len) throws IOException {
-		InputStream filteredIs;
 		if (!mightNeedCleaning()) {
-			filteredIs = is;
 			canonLen = len;
-		} else {
+			return is;
+		}
+
 		if (len <= MAXIMUM_FILE_SIZE_TO_READ_FULLY) {
 			ByteBuffer rawbuf = IO.readWholeStream(is, (int) len);
 			byte[] raw = rawbuf.array();
@@ -349,25 +349,22 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
 				raw = rawbuf.array();
 				n = rawbuf.limit();
 			}
-				filteredIs = new ByteArrayInputStream(raw, 0, n);
 			canonLen = n;
-			} else {
+			return new ByteArrayInputStream(raw, 0, n);
+		}
+
 		if (isBinary(e)) {
-					filteredIs = is;
 			canonLen = len;
-				} else {
-					final InputStream lenIs = filterClean(e
-							.openInputStream());
+			return is;
+		}
+
+		final InputStream lenIs = filterClean(e.openInputStream());
 		try {
 			canonLen = computeLength(lenIs);
 		} finally {
 			safeClose(lenIs);
 		}
-					filteredIs = filterClean(is);
-				}
-			}
-		}
-		return filteredIs;
+		return filterClean(is);
 	}
 
 	private static void safeClose(final InputStream in) {