Author: stack
Date: Thu Apr 4 03:53:34 2013
New Revision: 1464280
URL: http://svn.apache.org/r1464280
Log:
HBASE-8230 Possible NPE on regionserver abort if replication service has not
been started
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java?rev=1464280&r1=1464279&r2=1464280&view=diff
==============================================================================
---
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
(original)
+++
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
Thu Apr 4 03:53:34 2013
@@ -154,7 +154,9 @@ public class Replication implements WALA
public void join() {
if (this.replication) {
this.replicationManager.join();
- this.replicationSink.stopReplicationSinkServices();
+ if (this.replicationSink != null) {
+ this.replicationSink.stopReplicationSinkServices();
+ }
}
}