svn commit: r1409288 - /accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

[ec...@apache.org]

Author: ecn
Date: Wed Nov 14 18:35:16 2012
New Revision: 1409288

URL: http://svn.apache.org/viewvc?rev=1409288&view=rev
Log:
ACCUMULO-855 applying patch to trunk

Modified:
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1409288&r1=1409287&r2=1409288&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Wed Nov 14 18:35:16 2012
@@ -301,19 +301,16 @@ public class LiveTServerSet implements W
   }
   
   public synchronized TServerConnection getConnection(TServerInstance server) throws TException {
-    TServerConnection result;
-    synchronized (this) {
-      if (server == null)
-        return null;
-      TServerInfo serverInfo = current.get(server.hostPort());
-      // lock was lost?
-      if (serverInfo == null)
-        return null;
-      // instance changed?
-      if (!serverInfo.instance.equals(server))
-        return null;
-      result = serverInfo.connection;
-    }
+    if (server == null)
+      return null;
+    TServerInfo serverInfo = current.get(server.hostPort());
+    // lock was lost?
+    if (serverInfo == null)
+      return null;
+    // instance changed?
+    if (!serverInfo.instance.equals(server))
+      return null;
+    TServerConnection result = serverInfo.connection;
     return result;
   }