jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpfis...@apache.org
Subject svn commit: r568903 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
Date Thu, 23 Aug 2007 09:32:54 GMT
Author: dpfister
Date: Thu Aug 23 02:32:53 2007
New Revision: 568903

URL: http://svn.apache.org/viewvc?rev=568903&view=rev
Log:
JCR-1078 - ChangeLog serialization causes cache inconsistencies
- Applying Martijn Hendriks' patch

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java?rev=568903&r1=568902&r2=568903&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
Thu Aug 23 02:32:53 2007
@@ -1120,13 +1120,13 @@
     private static void write(Record record, ChangeLog changeLog, EventStateCollection esc)
             throws JournalException {
 
-        Iterator addedStates = changeLog.addedStates();
-        while (addedStates.hasNext()) {
-            ItemState state = (ItemState) addedStates.next();
+        Iterator deletedStates = changeLog.deletedStates();
+        while (deletedStates.hasNext()) {
+            ItemState state = (ItemState) deletedStates.next();
             if (state.isNode()) {
-                write(record, NodeAddedOperation.create((NodeState) state));
+                write(record, NodeDeletedOperation.create((NodeState) state));
             } else {
-                write(record, PropertyAddedOperation.create((PropertyState) state));
+                write(record, PropertyDeletedOperation.create((PropertyState) state));
             }
         }
         Iterator modifiedStates = changeLog.modifiedStates();
@@ -1138,13 +1138,13 @@
                 write(record, PropertyModifiedOperation.create((PropertyState) state));
             }
         }
-        Iterator deletedStates = changeLog.deletedStates();
-        while (deletedStates.hasNext()) {
-            ItemState state = (ItemState) deletedStates.next();
+        Iterator addedStates = changeLog.addedStates();
+        while (addedStates.hasNext()) {
+            ItemState state = (ItemState) addedStates.next();
             if (state.isNode()) {
-                write(record, NodeDeletedOperation.create((NodeState) state));
+                write(record, NodeAddedOperation.create((NodeState) state));
             } else {
-                write(record, PropertyDeletedOperation.create((PropertyState) state));
+                write(record, PropertyAddedOperation.create((PropertyState) state));
             }
         }
 



Mime
View raw message