You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2007/08/21 20:50:30 UTC
svn commit: r568229 -
/incubator/abdera/java/trunk/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
Author: jmsnell
Date: Tue Aug 21 11:50:30 2007
New Revision: 568229
URL: http://svn.apache.org/viewvc?rev=568229&view=rev
Log:
Fix merge bug
Modified:
incubator/abdera/java/trunk/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.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=568229&r1=568228&r2=568229&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 Tue Aug 21 11:50:30 2007
@@ -249,7 +249,8 @@
if (id != null) {
Entry existing = destentries.get(id);
if (existing == null) {
- dest.addEntry((Entry)entry.clone());
+ Entry e = (Entry) entry.clone();
+ dest.addEntry(e);
} else {
Sync s1 = getSync(existing,false);
List<Entry> c1 = getConflicts(existing);
@@ -258,7 +259,7 @@
Entry w = null;
w = compareConflicts(w, c1,c2,m);
w = compareConflicts(w, c2,c1,m);
- if (w != null) dest.addEntry(w);
+// if (w != null) dest.addEntry((Entry)w.clone());
if (s1.isNoConflicts()) return;
if (m.size() > 0) {
Sync sync = getSync(w,true);