fix tests

Davies Liu · Davies Liu · commit 28340ef80150 · 2016-11-30T10:43:15.000-08:00
diff --git a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockFetcherIterator.scala b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockFetcherIterator.scala
@@ -356,6 +356,7 @@ final class ShuffleBlockFetcherIterator(
           // Only copy the stream if it's wrapped by compression or encryption, also the size of
           // block is small (the decompressed block is smaller than maxBytesInFlight)
           if (detectCorrupt && !input.eq(in) && size < maxBytesInFlight / 3) {
+            val originalInput = input
             val out = new ChunkedByteBufferOutputStream(64 * 1024, ByteBuffer.allocate)
             try {
               // Decompress the whole block at once to detect any corruption, which could increase
@@ -378,7 +379,7 @@ final class ShuffleBlockFetcherIterator(
                 }
             } finally {
               // TODO: release the buf here to free memory earlier
-              input.close()
+              originalInput.close()
               in.close()
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,7 @@ final class ShuffleBlockFetcherIterator(`
`356`	`356`	`// Only copy the stream if it's wrapped by compression or encryption, also the size of`
`357`	`357`	`// block is small (the decompressed block is smaller than maxBytesInFlight)`
`358`	`358`	`if (detectCorrupt && !input.eq(in) && size < maxBytesInFlight / 3) {`
	`359`	`+ val originalInput = input`
`359`	`360`	`val out = new ChunkedByteBufferOutputStream(64 * 1024, ByteBuffer.allocate)`
`360`	`361`	`try {`
`361`	`362`	`// Decompress the whole block at once to detect any corruption, which could increase`
`@@ -378,7 +379,7 @@ final class ShuffleBlockFetcherIterator(`
`378`	`379`	`}`
`379`	`380`	`} finally {`
`380`	`381`	`// TODO: release the buf here to free memory earlier`
`381`		`- input.close()`
	`382`	`+ originalInput.close()`
`382`	`383`	`in.close()`
`383`	`384`	`}`
`384`	`385`	`}`