xlawrence 2005/01/12 17:34:27 CET
Modified files:
syncServer/src/java/org/jahia/suite/calendar/sync4jModule
CalendarSyncSource.java
syncServer/src/java/org/jahia/suite/calendar/syncServer
CalendarManager.java
Log:
Correction of calendarID construction. (CalendarID: <userName> + "-" +
<deviceID>)
Revision Changes Path
1.2 +2 -2
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.1&r2=1.2&f=h
1.2 +15 -3
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java.diff?r1=1.1&r2=1.2&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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CalendarSyncSource.java 5 Jan 2005 10:04:25 -0000 1.1
+++ CalendarSyncSource.java 12 Jan 2005 16:34:27 -0000 1.2
@@ -333,10 +333,10 @@
result.setState(SyncItemState.UPDATED);
cm.addModifiedItem(result);
- // If the item doesn't exist on the calendar server, an INSERT is
needed
+ // If the item doesn't exist on the calendar server, an INSERT
is needed
} else {
result = new SyncItemImpl(this, cm.getNewGUID().toString(),
- SyncItemState.NEW);
+ SyncItemState.NEW);
result.setProperties(syncItem.getProperties());
cm.addNewItem(result);
}
Index: CalendarManager.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CalendarManager.java 5 Jan 2005 10:04:26 -0000 1.1
+++ CalendarManager.java 12 Jan 2005 16:34:27 -0000 1.2
@@ -234,6 +234,10 @@
timer.stop();
Calendar calendar = resp.getCalendar();
+ if (calendar == null) {
+ throw new SyncException(resp.getContent().toString());
+ }
+
SyncItem[] all = calendarToSyncItems(calendar);
log.debug("Number of calendar items returned: "+all.length);
this.allItems = new Vector(all.length);
@@ -265,13 +269,14 @@
ops.toArray(new SyncOperation[] {});
// make a proper request
UpdateCalendarRequest req = new UpdateCalendarRequest(newID(),
- (userName+deviceID), syncOps);
+ (userName+"-"+deviceID), syncOps);
// get the response from the calServer
RequestTimer timer = new RequestTimer(TIMEOUT, req.getID());
UpdateCalendarRequestResponse resp =
(UpdateCalendarRequestResponse)
transportSender.sendAndGetResponse(req);
timer.stop();
log.debug(resp);
+
} catch (Exception e) {
throw new SyncException(e.getMessage(), e);
}
@@ -284,9 +289,16 @@
public GUID getNewGUID() throws SyncException {
try {
GetGUIDRequest req = new GetGUIDRequest(newID());
+ req.setCalendarID(userName+"-"+deviceID);
GetGUIDRequestResponse resp = (GetGUIDRequestResponse)
transportSender.sendAndGetResponse(req);
- return resp.getGUID();
+ GUID guid = resp.getGUID();
+
+ if (guid == null) {
+ throw new SyncException(resp.getContent().toString());
+ }
+ return guid;
+
} catch (Exception e) {
throw new SyncException(e.getMessage(), e);
}
@@ -384,7 +396,7 @@
* A simple Timer that will automatically release the locks after a given
* time.
*/
- private class RequestTimer {
+ class RequestTimer {
private Timer timer;
