Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3F35E10849 for ; Tue, 26 Nov 2013 15:18:15 +0000 (UTC) Received: (qmail 62672 invoked by uid 500); 26 Nov 2013 15:18:13 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 62389 invoked by uid 500); 26 Nov 2013 15:18:09 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 62264 invoked by uid 99); 26 Nov 2013 15:17:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Nov 2013 15:17:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 209EF9184F2; Tue, 26 Nov 2013 15:17:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Tue, 26 Nov 2013 15:17:56 -0000 Message-Id: <35172c83b6424670a9d2ec8231f9f5b0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/37] git commit: ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility Updated Branches: refs/heads/1.4.5-SNAPSHOT 1fe5f7f52 -> 6446ad5c2 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 Ref: ACCUMULO-1792 Signed-off-by: Eric Newton 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.4.5-SNAPSHOT Commit: fc3fdf33716aa7105e1792c81dfb452fbf8c7944 Parents: aff0d64 Author: Billie Rinaldi Authored: Mon Oct 15 16:32:24 2012 +0000 Committer: Eric Newton 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); } }