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 0D536DFB6 for ; Mon, 15 Oct 2012 16:33:12 +0000 (UTC) Received: (qmail 11124 invoked by uid 500); 15 Oct 2012 16:33:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 11092 invoked by uid 500); 15 Oct 2012 16:33:11 -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 11084 invoked by uid 99); 15 Oct 2012 16:33:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2012 16:33:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2012 16:33:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1853A238899C for ; Mon, 15 Oct 2012 16:32:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1398373 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java Date: Mon, 15 Oct 2012 16:32:25 -0000 To: commits@accumulo.apache.org From: billie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121015163225.1853A238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: billie Date: Mon Oct 15 16:32:24 2012 New Revision: 1398373 URL: http://svn.apache.org/viewvc?rev=1398373&view=rev Log: ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java?rev=1398373&r1=1398372&r2=1398373&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java Mon Oct 15 16:32:24 2012 @@ -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); } }