svn commit: r1725960 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: mongo/MongoDocumentStore.java rdb/RDBDocumentStore.java

[reschke]

Author: reschke
Date: Thu Jan 21 14:33:39 2016
New Revision: 1725960

URL: http://svn.apache.org/viewvc?rev=1725960&view=rev
Log:
OAK-3906: NodeDocumentCache cleanup used inconsistently

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1725960&r1=1725959&r2=1725960&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
 Thu Jan 21 14:33:39 2016
@@ -1105,7 +1105,7 @@ public class MongoDocumentStore implemen
         try {
             nodesCache.close();
         } catch (IOException e) {
-            LOG.warn("Error occurred while closing Off Heap Cache", e);
+            LOG.warn("Error occurred while closing nodes cache", e);
         }
     }
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1725960&r1=1725959&r2=1725960&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
 Thu Jan 21 14:33:39 2016
@@ -630,6 +630,11 @@ public class RDBDocumentStore implements
         } catch (IOException ex) {
             LOG.error("closing connection handler", ex);
         }
+        try {
+            this.nodesCache.close();
+        } catch (IOException ex) {
+            LOG.warn("Error occurred while closing nodes cache", ex);
+        }
         LOG.info("RDBDocumentStore (" + OakVersion.getVersion() + ") disposed" 
+ getCnStats()
                 + (this.droppedTables.isEmpty() ? "" : " (tables dropped: " + 
this.droppedTables + ")"));
     }