svn commit: r1584091 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java

[jxiang]

Author: jxiang
Date: Wed Apr  2 16:50:27 2014
New Revision: 1584091

URL: http://svn.apache.org/r1584091
Log:
HBASE-10897 On master start, deadlock if refresh UI

Modified:
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java?rev=1584091&r1=1584090&r2=1584091&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
 Wed Apr  2 16:50:27 2014
@@ -72,7 +72,7 @@ public class MasterStatusServlet extends
     Set<ServerName> deadServers = null;
     
     if(master.isActiveMaster()) {
-      if (master.getServerManager() == null) {
+      if (!master.isInitialized()) {
         response.sendError(503, "Master not ready");
         return;
       }