hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1343838 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
Date Tue, 29 May 2012 16:41:22 GMT
Author: stack
Date: Tue May 29 16:41:22 2012
New Revision: 1343838

URL: http://svn.apache.org/viewvc?rev=1343838&view=rev
Log:
HBASE-6095 ActiveMasterManager NullPointerException

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java?rev=1343838&r1=1343837&r2=1343838&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
(original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
Tue May 29 16:41:22 2012
@@ -237,7 +237,7 @@ class ActiveMasterManager extends ZooKee
       byte [] bytes =
         ZKUtil.getDataAndWatch(watcher, watcher.masterAddressZNode);
       // TODO: redo this to make it atomic (only added for tests)
-      ServerName master = ServerName.parseVersionedServerName(bytes);
+      ServerName master = bytes == null ? null : ServerName.parseVersionedServerName(bytes);
       if (master != null &&  master.equals(this.sn)) {
         ZKUtil.deleteNode(watcher, watcher.masterAddressZNode);
       }



Mime
View raw message