Index: src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (revision 1083985) +++ src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (working copy) @@ -320,11 +320,11 @@ throws InterruptedException, IOException, NotAllMetaRegionsOnlineException { long stop = System.currentTimeMillis() + timeout; synchronized (metaAvailable) { - if (getMetaServerConnection(true) != null) { - return metaLocation; - } while(!stopped && !metaAvailable.get() && (timeout == 0 || System.currentTimeMillis() < stop)) { + if (getMetaServerConnection(true) != null) { + return metaLocation; + } metaAvailable.wait(timeout); } if (getMetaServerConnection(true) == null) {