Skip to content

Commit

Permalink
Addendum for HDFS-7748.
Browse files Browse the repository at this point in the history
  • Loading branch information
Haohui Mai committed Mar 30, 2015
1 parent 2a945d2 commit 0967b1d
Showing 1 changed file with 4 additions and 5 deletions.
Expand Up @@ -33,7 +33,6 @@
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Random; import java.util.Random;


import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
Expand Down Expand Up @@ -534,17 +533,17 @@ public void TestPipeLineAckCompatibility() throws IOException {
Status.CHECKSUM_OK)) Status.CHECKSUM_OK))
.build(); .build();


ByteOutputStream oldAckBytes = new ByteOutputStream(); ByteArrayOutputStream oldAckBytes = new ByteArrayOutputStream();
proto.writeDelimitedTo(oldAckBytes); proto.writeDelimitedTo(oldAckBytes);
PipelineAck oldAck = new PipelineAck(); PipelineAck oldAck = new PipelineAck();
oldAck.readFields(new ByteArrayInputStream(oldAckBytes.getBytes())); oldAck.readFields(new ByteArrayInputStream(oldAckBytes.toByteArray()));
assertEquals(PipelineAck.combineHeader(PipelineAck.ECN.DISABLED, Status assertEquals(PipelineAck.combineHeader(PipelineAck.ECN.DISABLED, Status
.CHECKSUM_OK), oldAck.getHeaderFlag(0)); .CHECKSUM_OK), oldAck.getHeaderFlag(0));


PipelineAck newAck = new PipelineAck(); PipelineAck newAck = new PipelineAck();
ByteOutputStream newAckBytes = new ByteOutputStream(); ByteArrayOutputStream newAckBytes = new ByteArrayOutputStream();
newProto.writeDelimitedTo(newAckBytes); newProto.writeDelimitedTo(newAckBytes);
newAck.readFields(new ByteArrayInputStream(newAckBytes.getBytes())); newAck.readFields(new ByteArrayInputStream(newAckBytes.toByteArray()));
assertEquals(PipelineAck.combineHeader(PipelineAck.ECN.SUPPORTED, Status assertEquals(PipelineAck.combineHeader(PipelineAck.ECN.SUPPORTED, Status
.CHECKSUM_OK), newAck.getHeaderFlag(0)); .CHECKSUM_OK), newAck.getHeaderFlag(0));
} }
Expand Down

0 comments on commit 0967b1d

Please sign in to comment.