svn commit: r1388566 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java

[kturner]

Author: kturner
Date: Fri Sep 21 16:35:51 2012
New Revision: 1388566

URL: http://svn.apache.org/viewvc?rev=1388566&view=rev
Log:
ACCUMULO-705 Made batchscanner only modify socket timeout when user specified 
timeout is less

Modified:
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1388566&r1=1388565&r2=1388566&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 Fri Sep 21 16:35:51 2012
@@ -45,6 +45,7 @@ import org.apache.accumulo.core.client.T
 import org.apache.accumulo.core.client.TableOfflineException;
 import org.apache.accumulo.core.client.TimedOutException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Column;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyExtent;
@@ -626,7 +627,7 @@ public class TabletServerBatchReaderIter
     TTransport transport = null;
     try {
       TabletClientService.Client client;
-      if (timeoutTracker.getTimeOut() < Long.MAX_VALUE)
+      if (timeoutTracker.getTimeOut() < 
conf.getTimeInMillis(Property.GENERAL_RPC_TIMEOUT))
         client = ThriftUtil.getTServerClient(server, conf, 
timeoutTracker.getTimeOut());
       else
         client = ThriftUtil.getTServerClient(server, conf);