jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r650341 - in /jackrabbit/branches/1.4/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
Date Tue, 22 Apr 2008 01:12:34 GMT
Author: jukka
Date: Mon Apr 21 18:12:32 2008
New Revision: 650341

URL: http://svn.apache.org/viewvc?rev=650341&view=rev
Log:
1.4: Merged revision 639221 (JCR-1491)

Modified:
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
    jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java?rev=650341&r1=650340&r2=650341&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
Mon Apr 21 18:12:32 2008
@@ -571,7 +571,7 @@
             if (u == null) {
                 continue;
             }
-            if (bigger != null && bigger.toString().compareTo(u.toString()) <
0) {
+            if (bigger != null && bigger.toString().compareTo(u.toString()) >=
0) {
                 continue;
             }
             NodeId n = new NodeId(u);

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java?rev=650341&r1=650340&r2=650341&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
Mon Apr 21 18:12:32 2008
@@ -83,15 +83,22 @@
             log("All nodes in one step");
             NodeIdIterator it = apm.getAllNodeIds(null, 0);
             NodeId after = null;
+            NodeId first = null;
             while (it.hasNext()) {
                 NodeId id = it.nextNodeId();
                 log("  " + id.toString());
+                if (first == null) {
+                    // initialize first node id
+                    first = id;
+                }
                 if (after != null) {
                     assertFalse(id.getUUID().compareTo(after.getUUID()) == 0);
                 }
                 after = id;
             }
 
+            // start with first
+            after = first;
             log("All nodes using batches");
             while (true) {
                 log(" bigger than: " + after);



Mime
View raw message