svn commit: r791920 - /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java

[jdcryans]

Author: jdcryans
Date: Tue Jul  7 17:53:28 2009
New Revision: 791920

URL: http://svn.apache.org/viewvc?rev=791920&view=rev
Log:
HBASE-1575  HMaster does not handle ZK session expiration
Forgot 3 lines

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=791920&r1=791919&r2=791920&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java 
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java Tue 
Jul  7 17:53:28 2009
@@ -1106,7 +1106,8 @@
     if(event.getState() == KeeperState.Expired || 
         (event.getType().equals(EventType.NodeDeleted) && 
             event.getPath().equals(
-                this.zooKeeperWrapper.getMasterElectionZNode()))) {
+                this.zooKeeperWrapper.getMasterElectionZNode())) 
+                && !shutdownRequested.get()) {
       LOG.error("Master lost its znode, killing itself now");
       System.exit(1);
     }