From commits-return-4439-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Thu Aug 23 09:33:22 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 72134 invoked from network); 23 Aug 2007 09:33:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Aug 2007 09:33:19 -0000 Received: (qmail 4206 invoked by uid 500); 23 Aug 2007 09:33:12 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 4173 invoked by uid 500); 23 Aug 2007 09:33:11 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 4140 invoked by uid 99); 23 Aug 2007 09:33:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2007 02:33:11 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2007 09:33:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D7321A981D; Thu, 23 Aug 2007 02:32:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@jackrabbit.apache.org From: dpfister@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070823093254.3D7321A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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)); } }