You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/05/21 03:59:44 UTC

svn commit: r1484643 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java

Author: tedyu
Date: Tue May 21 01:59:44 2013
New Revision: 1484643

URL: http://svn.apache.org/r1484643
Log:
HBASE-8582 Possible NullPointerException in ZKInterProcessLockBase#visitLocks (Ted Yu)


Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java?rev=1484643&r1=1484642&r2=1484643&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java Tue May 21 01:59:44 2013
@@ -423,7 +423,7 @@ public abstract class ZKInterProcessLock
       LOG.error("Unexpected ZooKeeper error when listing children", e);
       throw new IOException("Unexpected ZooKeeper exception", e);
     }
-    if (children.size() > 0) {
+    if (children != null && children.size() > 0) {
       for (String child : children) {
         if (isChildOfSameType(child)) {
           String znode = ZKUtil.joinZNode(parentLockNode, child);