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 re...@apache.org on 2019/02/21 17:48:38 UTC
svn commit: r1854070 - in /jackrabbit/oak/branches/1.10: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
Author: reschke
Date: Thu Feb 21 17:48:38 2019
New Revision: 1854070
URL: http://svn.apache.org/viewvc?rev=1854070&view=rev
Log:
OAK-8052: PersistentCache: failure during construction may lead to resource leak (ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 21 17:48:38 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997
+/jackrabbit/oak/trunk:1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java?rev=1854070&r1=1854069&r2=1854070&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java Thu Feb 21 17:48:38 2019
@@ -194,18 +194,25 @@ public class PersistentCache implements
}
generations.remove(oldest);
}
- readGeneration = generations.size() > 1 ? generations.first() : -1;
- writeGeneration = generations.size() > 0 ? generations.last() : 0;
- if (readGeneration >= 0) {
- readStore = createMapFactory(readGeneration, true);
- }
- writeStore = createMapFactory(writeGeneration, false);
- initBroadcast(broadcast);
- writeDispatcher = new CacheActionDispatcher();
- writeDispatcherThread = new Thread(writeDispatcher, "Oak CacheWriteQueue");
- writeDispatcherThread.setDaemon(true);
- writeDispatcherThread.start();
+ try {
+ readGeneration = generations.size() > 1 ? generations.first() : -1;
+ writeGeneration = generations.size() > 0 ? generations.last() : 0;
+ if (readGeneration >= 0) {
+ readStore = createMapFactory(readGeneration, true);
+ }
+ writeStore = createMapFactory(writeGeneration, false);
+ initBroadcast(broadcast);
+
+ writeDispatcher = new CacheActionDispatcher();
+ writeDispatcherThread = new Thread(writeDispatcher, "Oak CacheWriteQueue");
+ writeDispatcherThread.setDaemon(true);
+ writeDispatcherThread.start();
+ } catch (RuntimeException ex) {
+ // OAK-8052: cleanup stores in case of failure
+ LOG.error("Exception during PersistentCache instantiation for {}.", url);
+ close();
+ }
}
private void logUnsupportedWarning(String configKey) {