Author: reschke
Date: Thu Feb 21 10:51:01 2019
New Revision: 1854034
URL: http://svn.apache.org/viewvc?rev=1854034&view=rev
Log:
OAK-8052: PersistentCache: failure during construction may lead to resource leak
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java?rev=1854034&r1=1854033&r2=1854034&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
Thu Feb 21 10:51:01 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) {
