hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject hadoop git commit: Addendum for HDFS-7748.
Date Mon, 30 Mar 2015 20:11:09 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 2a945d24f -> 0967b1d99


Addendum for HDFS-7748.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0967b1d9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0967b1d9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0967b1d9

Branch: refs/heads/trunk
Commit: 0967b1d99d7001cd1d09ebd29b9360f1079410e8
Parents: 2a945d2
Author: Haohui Mai <wheat9@apache.org>
Authored: Mon Mar 30 12:23:45 2015 -0700
Committer: Haohui Mai <wheat9@apache.org>
Committed: Mon Mar 30 13:11:09 2015 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/TestDataTransferProtocol.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0967b1d9/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
index fcfaa0c..bf011f7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
@@ -33,7 +33,6 @@ import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.util.Random;
 
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -534,17 +533,17 @@ public class TestDataTransferProtocol {
                                            Status.CHECKSUM_OK))
         .build();
 
-    ByteOutputStream oldAckBytes = new ByteOutputStream();
+    ByteArrayOutputStream oldAckBytes = new ByteArrayOutputStream();
     proto.writeDelimitedTo(oldAckBytes);
     PipelineAck oldAck = new PipelineAck();
-    oldAck.readFields(new ByteArrayInputStream(oldAckBytes.getBytes()));
+    oldAck.readFields(new ByteArrayInputStream(oldAckBytes.toByteArray()));
     assertEquals(PipelineAck.combineHeader(PipelineAck.ECN.DISABLED, Status
         .CHECKSUM_OK), oldAck.getHeaderFlag(0));
 
     PipelineAck newAck = new PipelineAck();
-    ByteOutputStream newAckBytes = new ByteOutputStream();
+    ByteArrayOutputStream newAckBytes = new ByteArrayOutputStream();
     newProto.writeDelimitedTo(newAckBytes);
-    newAck.readFields(new ByteArrayInputStream(newAckBytes.getBytes()));
+    newAck.readFields(new ByteArrayInputStream(newAckBytes.toByteArray()));
     assertEquals(PipelineAck.combineHeader(PipelineAck.ECN.SUPPORTED, Status
         .CHECKSUM_OK), newAck.getHeaderFlag(0));
   }


Mime
View raw message