You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2015/04/27 12:25:26 UTC
svn commit: r1676237 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Author: alexparvulescu
Date: Mon Apr 27 10:25:26 2015
New Revision: 1676237
URL: http://svn.apache.org/r1676237
Log:
OAK-2811 Oak + data store: NPE in SegmentNodeStoreService.deactivate() leads to data store not shutting down properly
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java?rev=1676237&r1=1676236&r2=1676237&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java Mon Apr 27 10:25:26 2015
@@ -439,12 +439,17 @@ public class SegmentNodeStoreService ext
public synchronized void deactivate() {
unregisterNodeStore();
- observerTracker.stop();
- gcMonitor.stop();
+ if (observerTracker != null) {
+ observerTracker.stop();
+ }
+ if (gcMonitor != null) {
+ gcMonitor.stop();
+ }
delegate = null;
-
- store.close();
- store = null;
+ if (store != null) {
+ store.close();
+ store = null;
+ }
}
protected void bindBlobStore(BlobStore blobStore) throws IOException {