Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 92221 invoked from network); 28 Oct 2007 03:34:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Oct 2007 03:34:01 -0000 Received: (qmail 66786 invoked by uid 500); 28 Oct 2007 03:33:49 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 66770 invoked by uid 500); 28 Oct 2007 03:33:49 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 66761 invoked by uid 99); 28 Oct 2007 03:33:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Oct 2007 20:33:48 -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; Sun, 28 Oct 2007 03:34:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 47FA61A9832; Sat, 27 Oct 2007 20:33:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r589266 - in /incubator/abdera/java/trunk/extensions/sharing/src: main/java/org/apache/abdera/ext/sharing/SharingHelper.java test/java/org/apache/abdera/test/ext/sharing/SharingTest.java Date: Sun, 28 Oct 2007 03:33:35 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071028033336.47FA61A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Sat Oct 27 20:33:35 2007 New Revision: 589266 URL: http://svn.apache.org/viewvc?rev=589266&view=rev Log: Fix the sharing ext test Modified: incubator/abdera/java/trunk/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java incubator/abdera/java/trunk/extensions/sharing/src/test/java/org/apache/abdera/test/ext/sharing/SharingTest.java Modified: incubator/abdera/java/trunk/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java?rev=589266&r1=589265&r2=589266&view=diff ============================================================================== --- incubator/abdera/java/trunk/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java (original) +++ incubator/abdera/java/trunk/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java Sat Oct 27 20:33:35 2007 @@ -280,7 +280,9 @@ for (Entry x : conflicts) { Sync xsync = getSync(x,false); if (xsync != null) { - for (History h1 : xsync.getHistory()) { + List list = xsync.getHistory(); + History[] history = list.toArray(new History[list.size()]); + for (History h1 : history) { boolean ok = true; for (History h2 : sync.getHistory()) { if (isSubsumed(h1,h2)) { @@ -288,7 +290,8 @@ break; } } - if (ok) sync.addHistory(h1); + if (h1.getParentElement() != sync && ok) + sync.addHistory((History) h1.clone()); } } } Modified: incubator/abdera/java/trunk/extensions/sharing/src/test/java/org/apache/abdera/test/ext/sharing/SharingTest.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/sharing/src/test/java/org/apache/abdera/test/ext/sharing/SharingTest.java?rev=589266&r1=589265&r2=589266&view=diff ============================================================================== --- incubator/abdera/java/trunk/extensions/sharing/src/test/java/org/apache/abdera/test/ext/sharing/SharingTest.java (original) +++ incubator/abdera/java/trunk/extensions/sharing/src/test/java/org/apache/abdera/test/ext/sharing/SharingTest.java Sat Oct 27 20:33:35 2007 @@ -21,6 +21,8 @@ import java.util.Date; import java.util.List; +import junit.framework.TestCase; + import org.apache.abdera.Abdera; import org.apache.abdera.ext.sharing.Conflicts; import org.apache.abdera.ext.sharing.History; @@ -35,8 +37,6 @@ import org.apache.abdera.model.Document; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; - -import junit.framework.TestCase; public class SharingTest extends TestCase {