jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cko...@apache.org
Subject svn commit: r1444667 - /jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/MultiDataStore.java
Date Mon, 11 Feb 2013 06:56:54 GMT
Author: ckoell
Date: Mon Feb 11 06:56:54 2013
New Revision: 1444667

URL: http://svn.apache.org/r1444667
Log:
JCR-3512 DelayedDelete in MultiDatastore does not work correctly

Modified:
    jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/MultiDataStore.java

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/MultiDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/MultiDataStore.java?rev=1444667&r1=1444666&r2=1444667&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/MultiDataStore.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/MultiDataStore.java
Mon Feb 11 06:56:54 2013
@@ -475,6 +475,7 @@ public class MultiDataStore implements D
                     ((LocalFileSystem) identifiersToDeleteFile.getFileSystem()).getPath(),
                     identifiersToDeleteFile.getPath());
             writer = new BufferedWriter(new FileWriter(identifierFile, true));
+            writer.write(identifier.toString());
             return true;
         } catch (Exception e) {
             log.warn("I/O error while saving DataIdentifier (stacktrace on DEBUG log level)
to '"
@@ -557,7 +558,8 @@ public class MultiDataStore implements D
         protected void moveOutdatedData() {
             try {
                 long now = System.currentTimeMillis();
-                long maxAgeMilli = 1000 * 60 * 60 * 24 * maxAge;
+                long maxAgeMilli = 1000L * 60 * 60 * 24 * maxAge;
+                log.debug("Collecting all Identifiers from PrimaryDataStore...");
                 Iterator<DataIdentifier> allIdentifiers = primaryDataStore.getAllIdentifiers();
                 int moved = 0;
                 while (allIdentifiers.hasNext()) {



Mime
View raw message