You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/09/11 17:27:12 UTC

svn commit: r1521903 - /hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

Author: stack
Date: Wed Sep 11 15:27:12 2013
New Revision: 1521903

URL: http://svn.apache.org/r1521903
Log:
HBASE-9498 NPE in HBaseAdmin if master not running

Modified:
    hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1521903&r1=1521902&r2=1521903&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Wed Sep 11 15:27:12 2013
@@ -3062,7 +3062,8 @@ public class HBaseAdmin implements Abort
 
     @Override
     public void close() throws IOException {
-      this.masterAdmin.close();
+      // The above prepare could fail but this would still be called though masterAdmin is null
+      if (this.masterAdmin != null) this.masterAdmin.close();
     }
   }
 
@@ -3083,7 +3084,8 @@ public class HBaseAdmin implements Abort
 
     @Override
     public void close() throws IOException {
-      this.masterMonitor.close();
+      // The above prepare could fail but this would still be called though masterMonitor is null
+      if (this.masterMonitor != null) this.masterMonitor.close();
     }
   }