Author: catholicon
Date: Wed Aug 8 23:00:17 2018
New Revision: 1837678
URL: http://svn.apache.org/viewvc?rev=1837678&view=rev
Log:
OAK-7699: Active blob deletion fails on composite setups (follow up of OAK-7610)
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1837678&r1=1837677&r2=1837678&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Wed Aug 8 23:00:17 2018
@@ -698,13 +698,15 @@ public class DocumentNodeStoreService {
}
}
- addRegistration(
- registerMBean(whiteboard,
- CheckpointMBean.class,
- new DocumentCheckpointMBean(store),
- CheckpointMBean.TYPE,
- "Document node store checkpoint management")
- );
+ if (!isNodeStoreProvider()) {
+ addRegistration(
+ registerMBean(whiteboard,
+ CheckpointMBean.class,
+ new DocumentCheckpointMBean(store),
+ CheckpointMBean.TYPE,
+ "Document node store checkpoint management")
+ );
+ }
addRegistration(
registerMBean(whiteboard,