incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1224991 - /incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
Date Tue, 27 Dec 2011 19:46:44 GMT
Author: ecn
Date: Tue Dec 27 19:46:44 2011
New Revision: 1224991

URL: http://svn.apache.org/viewvc?rev=1224991&view=rev
Log:
ACCUMULO-236 removing questionable reference to unused  instance variable

Modified:
    incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1224991&r1=1224990&r2=1224991&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
(original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
Tue Dec 27 19:46:44 2011
@@ -45,7 +45,6 @@ import org.apache.accumulo.server.securi
 import org.apache.accumulo.server.util.time.SimpleTimer;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
@@ -65,7 +64,6 @@ public class LiveTServerSet implements W
   class TServerConnection {
     private final InetSocketAddress address;
     
-    TTransport transport = null;
     TabletClientService.Iface client = null;
     
     public TServerConnection(InetSocketAddress addr) {
@@ -84,14 +82,14 @@ public class LiveTServerSet implements W
     }
     
     synchronized public void connectIfNeeded() throws TException {
-      if (transport == null) {
-        try {
-          close();
-          client = ThriftUtil.getClient(new TabletClientService.Client.Factory(), address,
AccumuloConfiguration.getSystemConfiguration());
-        } catch (TException iox) {
-          log.error("Could not connect to tablet server " + address + " : " + iox.getMessage());
-          throw iox;
-        }
+      if (client != null)
+        return;
+      try {
+        close();
+        client = ThriftUtil.getClient(new TabletClientService.Client.Factory(), address,
AccumuloConfiguration.getSystemConfiguration());
+      } catch (TException iox) {
+        log.error("Could not connect to tablet server " + address + " : " + iox.getMessage());
+        throw iox;
       }
     }
     



Mime
View raw message