xlawrence 2005/01/25 14:14:16 CET
Modified files:
syncServer/src/java/org/jahia/suite/calendar/sync4jModule
CalendarSyncSource.java
Log:
Corrected syncItemTwin detection bug
Revision Changes Path
1.4 +3 -6
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java.diff?r1=1.3&r2=1.4&f=h
Index: CalendarSyncSource.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CalendarSyncSource.java 21 Jan 2005 15:40:48 -0000 1.3
+++ CalendarSyncSource.java 25 Jan 2005 13:14:16 -0000 1.4
@@ -213,14 +213,11 @@
}
SyncItem result = syncItems[0];
- // check that this item has not been deleted or modified during the
+ // check that this item has not been deleted or modified during the
// sync session
- if (cm.getDeleteItems().contains(result)) {
+ if (cm.getDeleteItems().contains(result) ||
+ cm.getModifyItems().contains(result)) {
return null;
-
- } else if (cm.getModifyItems().contains(result)) {
- Vector temp = cm.getModifyItems();
- result = (SyncItem)temp.get(temp.indexOf(result));
}
log.debug("Found: " + result.getKey().getKeyAsString());
