jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From am...@apache.org
Subject svn commit: r1772301 - in /jackrabbit/branches/2.12: ./ jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java
Date Fri, 02 Dec 2016 04:39:23 GMT
Author: amitj
Date: Fri Dec  2 04:39:23 2016
New Revision: 1772301

URL: http://svn.apache.org/viewvc?rev=1772301&view=rev
Log:
JCR-4072: Creation of marker file fails when parent folder does not exist in CachingDataStore

Merged r1772299 from trunk

Modified:
    jackrabbit/branches/2.12/   (props changed)
    jackrabbit/branches/2.12/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java

Propchange: jackrabbit/branches/2.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 04:39:23 2016
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1732436,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1768684,1771078,1771741
+/jackrabbit/trunk:1732436,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1768684,1771078,1771741,1772299

Modified: jackrabbit/branches/2.12/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java?rev=1772301&r1=1772300&r2=1772301&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java
(original)
+++ jackrabbit/branches/2.12/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java
Fri Dec  2 04:39:23 2016
@@ -269,6 +269,8 @@ public abstract class CachingDataStore e
             LOG.info("path=[{}],  tmpPath=[{}]", path, tmpDir.getAbsolutePath());
             directory = new File(path);
             mkdirs(directory);
+            mkdirs(new File(homeDir));
+
             if (!mkdirs(tmpDir)) {
                 FileUtils.cleanDirectory(tmpDir);
                 LOG.info("tmp=[{}] cleaned.", tmpDir.getPath());



Mime
View raw message