浏览代码

Addendum for HDFS-7748.

Haohui Mai 10 年之前
父节点
当前提交
0967b1d99d

+ 4 - 5
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.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;
@@ -534,17 +533,17 @@ public class TestDataTransferProtocol {
                                            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));
   }
   }