You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by uj...@apache.org on 2013/12/27 18:30:38 UTC
[3/4] git commit: Merge remote-tracking branch
'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4aa48e1c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4aa48e1c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4aa48e1c
Branch: refs/heads/master
Commit: 4aa48e1cb5c7a2c07117efe4f63564de2c5963a9
Parents: 7838d40 7449524
Author: Bill Slacum <uj...@apache.org>
Authored: Fri Dec 27 12:27:20 2013 -0500
Committer: Bill Slacum <uj...@apache.org>
Committed: Fri Dec 27 12:27:20 2013 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/ZooKeeperInstance.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4aa48e1c/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 20823dc,d96091b..4d12103
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@@ -199,10 -183,10 +199,10 @@@ public class ZooKeeperInstance implemen
}
@Override
- public String getRootTabletLocation() {
+ public synchronized String getRootTabletLocation() {
if (closed)
throw new RuntimeException("ZooKeeperInstance has been closed.");
- String zRootLocPath = ZooUtil.getRoot(this) + Constants.ZROOT_TABLET_LOCATION;
+ String zRootLocPath = ZooUtil.getRoot(this) + RootTable.ZROOT_TABLET_LOCATION;
OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location in zookeeper.");
byte[] loc = zooCache.get(zRootLocPath);