xlawrence 2004/12/13 15:45:49 CET
Modified files:
src/java/org/jahia/suite/calendar/sync4jModule
CalendarSyncSource.java
Log:
Method getTwinItems will allways return null !!!
Revision Changes Path
1.8 +19 -2
uwcal_JSR168/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java.diff?r1=1.7&r2=1.8&f=h
Index: CalendarSyncSource.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CalendarSyncSource.java 13 Dec 2004 09:57:16 -0000 1.7
+++ CalendarSyncSource.java 13 Dec 2004 14:45:49 -0000 1.8
@@ -193,14 +193,31 @@
throws SyncSourceException {
log.debug("getSyncItemFromTwin(" + principal + " , " +
syncItem.getKey().getKeyAsString() + ")");
+
+ // Sync4j contains a bug !!! The mapping is not done correctly when
a
+ // twin item is found
+ if (true) return null;
+
SyncItem[] syncItems =
getSyncItemsFromTwins(principal, new SyncItem[] {syncItem});
if ((syncItems == null) || (syncItems.length == 0)) {
return null; // not found
}
- log.debug("Found: "+syncItems[0].getKey().getKeyAsString());
- return syncItems[0];
+
+ SyncItem result = syncItems[0];
+ // check that this item has not been deleted or modified during the
+ // sync session
+ if (cm.getDeleteItems().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());
+ return result;
}
/**
