### Eclipse Workspace Patch 1.0 #P apache-trunk Index: hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (revision 1438356) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (working copy) @@ -428,6 +428,7 @@ throws InterruptedException, IOException, NotAllMetaRegionsOnlineException { long stop = timeout == 0 ? Long.MAX_VALUE : System.currentTimeMillis() + timeout; long waitTime = Math.min(50, timeout); + if (waitTime <= 0) waitTime = 50; synchronized (metaAvailable) { while(!stopped && System.currentTimeMillis() < stop) { if (getMetaServerConnection() != null) { @@ -464,10 +465,7 @@ public void resetMetaLocation() { LOG.debug("Current cached META location, " + metaLocation + ", is not valid, resetting"); - synchronized(this.metaAvailable) { - this.metaAvailable.set(false); - this.metaAvailable.notifyAll(); - } + this.metaAvailable.set(false); } /**