Permalink
Browse files

ACCUMULO-855 applying patch to trunk

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1409288 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
Eric C. Newton
Eric C. Newton committed Nov 14, 2012
1 parent 3132b2b commit 1b68d2571018b191b39ec96a7c48cd9ffbc0095d
Showing with 10 additions and 13 deletions.
  1. +10 −13 server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -301,19 +301,16 @@ public void process(WatchedEvent event) {
}
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;
}

0 comments on commit 1b68d25

Please sign in to comment.