svn commit: r941544 - /hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java

[stack]

Author: stack
Date: Wed May  5 23:32:50 2010
New Revision: 941544

URL: http://svn.apache.org/viewvc?rev=941544&view=rev
Log:
HBASE-2513 hbase-2414 added bug where we'd tight-loop if no root available

Modified:
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java?rev=941544&r1=941543&r2=941544&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java
 Wed May  5 23:32:50 2010
@@ -103,8 +103,8 @@ public class RegionServerOperationQueue 
     // it first.
     if (rootRegionLocation != null) {
       op = delayedToDoQueue.poll();
-    } else {
-    // if there aren't any todo items in the queue, sleep for a bit.
+    }
+    if (op == null) {
       try {
         op = toDoQueue.poll(threadWakeFrequency, TimeUnit.MILLISECONDS);
       } catch (InterruptedException e) {
@@ -235,4 +235,4 @@ public class RegionServerOperationQueue 
     }
     return true;
   }
-}
\ No newline at end of file
+}