accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [01/38] git commit: ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
Date Tue, 26 Nov 2013 15:47:05 GMT
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT f896c9566 -> ad9ee5e06


ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1398373 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ca1494d1508a3b1404ae9989d4211b00aa3ce307)

Reason: Hadoop2 compat
Author: Billie Rinaldi <billie@apache.org>
Ref: ACCUMULO-1792

Signed-off-by: Eric Newton <eric.newton@gmail.com>


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: fc3fdf33716aa7105e1792c81dfb452fbf8c7944
Parents: aff0d64
Author: Billie Rinaldi <billie@apache.org>
Authored: Mon Oct 15 16:32:24 2012 +0000
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Nov 25 16:06:41 2013 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/TTimeoutTransport.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc3fdf33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
----------------------------------------------------------------------
diff --git a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 6f74451..3c1fa6a 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -25,8 +25,7 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.nio.channels.spi.SelectorProvider;
 
-import org.apache.hadoop.net.SocketInputStream;
-import org.apache.hadoop.net.SocketOutputStream;
+import org.apache.hadoop.net.NetUtils;
 import org.apache.thrift.transport.TIOStreamTransport;
 import org.apache.thrift.transport.TTransport;
 
@@ -37,8 +36,8 @@ public class TTimeoutTransport {
     socket.setSoLinger(false, 0);
     socket.setTcpNoDelay(true);
     socket.connect(addr);
-    InputStream input = new BufferedInputStream(new SocketInputStream(socket, timeoutMillis),
1024 * 10);
-    OutputStream output = new BufferedOutputStream(new SocketOutputStream(socket, timeoutMillis),
1024 * 10);
+    InputStream input = new BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis),
1024 * 10);
+    OutputStream output = new BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis),
1024 * 10);
     return new TIOStreamTransport(input, output);
   }
 }


Mime
View raw message