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/14 18:27:41 UTC

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

Author: tedyu
Date: Tue May 14 16:27:41 2013
New Revision: 1482429

URL: http://svn.apache.org/r1482429
Log:
HBASE-8536 Possible NullPointerException in ZKInterProcessLockBase#reapExpiredLocks (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=1482429&r1=1482428&r2=1482429&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 14 16:27:41 2013
@@ -386,6 +386,7 @@ public abstract class ZKInterProcessLock
       LOG.error("Unexpected ZooKeeper error when listing children", e);
       throw new IOException("Unexpected ZooKeeper exception", e);
     }
+    if (children == null) return;
 
     KeeperException deferred = null;
     Stat stat = new Stat();