Author: reschke
Date: Wed Sep 30 11:54:10 2015
New Revision: 1706009
URL: http://svn.apache.org/viewvc?rev=1706009&view=rev
Log:
OAK-3449: switch DocumentNodeStore support for predefined clusterIds to use
ClusterNodeInfos (remove obsolete null check)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1706009&r1=1706008&r2=1706009&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Wed Sep 30 11:54:10 2015
@@ -585,12 +585,10 @@ public final class DocumentNodeStore
LOG.error("dispose: an AssertionError happened during dispose's
last background ops: "+ae, ae);
}
- if (leaseUpdateThread != null) {
- try {
- leaseUpdateThread.join();
- } catch (InterruptedException e) {
- // ignore
- }
+ try {
+ leaseUpdateThread.join();
+ } catch (InterruptedException e) {
+ // ignore
}
// now mark this cluster node as inactive by
