Clean up some code.

Marcelo Vanzin · Marcelo Vanzin · commit cf2a605d02af · 2015-04-06T16:02:40.000-07:00
diff --git a/network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java b/network/common/src/main/java/org/apache/spark/network/sasl/SaslEncryption.java
@@ -196,7 +196,6 @@ public long transferTo(final WritableByteChannel target, final long position)
       do {
         if (currentChunk == null) {
           nextChunk();
-          currentHeader = Unpooled.copyLong(8 + currentChunkSize);
         }
 
         if (currentHeader.readableBytes() > 0) {
@@ -236,6 +235,7 @@ private void nextChunk() throws IOException {
       byte[] encrypted = backend.wrap(byteChannel.getData(), 0, byteChannel.length());
       this.currentChunk = ByteBuffer.wrap(encrypted);
       this.currentChunkSize = encrypted.length;
+      this.currentHeader = Unpooled.copyLong(8 + currentChunkSize);
       this.unencryptedChunkSize = byteChannel.length();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,6 @@ public long transferTo(final WritableByteChannel target, final long position)`
`196`	`196`	`do {`
`197`	`197`	`if (currentChunk == null) {`
`198`	`198`	`nextChunk();`
`199`		`- currentHeader = Unpooled.copyLong(8 + currentChunkSize);`
`200`	`199`	`}`
`201`	`200`
`202`	`201`	`if (currentHeader.readableBytes() > 0) {`
`@@ -236,6 +235,7 @@ private void nextChunk() throws IOException {`
`236`	`235`	`byte[] encrypted = backend.wrap(byteChannel.getData(), 0, byteChannel.length());`
`237`	`236`	`this.currentChunk = ByteBuffer.wrap(encrypted);`
`238`	`237`	`this.currentChunkSize = encrypted.length;`
	`238`	`+ this.currentHeader = Unpooled.copyLong(8 + currentChunkSize);`
`239`	`239`	`this.unencryptedChunkSize = byteChannel.length();`
`240`	`240`	`}`
`241`	`241`