You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/01/25 22:14:47 UTC
svn commit: r1438712 - in /accumulo/trunk:
core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
Author: vines
Date: Fri Jan 25 21:14:46 2013
New Revision: 1438712
URL: http://svn.apache.org/viewvc?rev=1438712&view=rev
Log:
ACCUMULO-259 - fixes a lot of tests
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1438712&r1=1438711&r2=1438712&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Fri Jan 25 21:14:46 2013
@@ -322,7 +322,7 @@ public class ZooKeeperInstance implement
public String getSecurityTokenClass() throws AccumuloException {
Client client = null;
try {
- client = MasterClient.getConnection(this);
+ client = MasterClient.getConnectionWithRetry(this);
return client.getSecurityTokenClass();
} catch (TTransportException e) {
throw new AccumuloException(e);
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java?rev=1438712&r1=1438711&r2=1438712&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java Fri Jan 25 21:14:46 2013
@@ -215,7 +215,7 @@ public class HdfsZooInstance implements
public String getSecurityTokenClass() throws AccumuloException {
Client client = null;
try {
- client = MasterClient.getConnection(this);
+ client = MasterClient.getConnectionWithRetry(this);
return client.getSecurityTokenClass();
} catch (TTransportException e) {
throw new AccumuloException(e);