You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/01/22 21:17:44 UTC
svn commit: r1560494 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: apurtell
Date: Wed Jan 22 20:17:43 2014
New Revision: 1560494
URL: http://svn.apache.org/r1560494
Log:
Amend HBASE-10338 Fix NPE if the server is terminated before the RegionServerCoprocessorHost is initialized (Vandana Ayyalasomayajula)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1560494&r1=1560493&r2=1560494&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Jan 22 20:17:43 2014
@@ -1734,7 +1734,9 @@ public class HRegionServer implements Cl
@Override
public void stop(final String msg) {
try {
- this.rsHost.preStop(msg);
+ if (this.rsHost != null) {
+ this.rsHost.preStop(msg);
+ }
this.stopped = true;
LOG.info("STOPPED: " + msg);
// Wakes run() if it is sleeping