xlawrence 2005/01/04 14:46:07 CET
Modified files:
src/java/org/jahia/suite/calendar/calServer
Calendarclient.java
SyncManager.java
Revision Changes Path
1.4 +2 -4
uwcal_JSR168/src/java/org/jahia/suite/calendar/calServer/Calendarclient.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/calServer/Calendarclient.java.diff?r1=1.3&r2=1.4&f=h
1.7 +1 -0
uwcal_JSR168/src/java/org/jahia/suite/calendar/calServer/SyncManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/calServer/SyncManager.java.diff?r1=1.6&r2=1.7&f=h
Index: Calendarclient.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/calServer/Calendarclient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Calendarclient.java 17 Dec 2004 15:46:59 -0000 1.3
+++ Calendarclient.java 4 Jan 2005 13:46:06 -0000 1.4
@@ -101,11 +101,9 @@
// The Sync Server is requesting the data of a user's calendar
if (msg instanceof GetCalendarRequest) {
GetCalendarRequest req = (GetCalendarRequest)msg;
- log.debug(req.getType()+":
"+req.getUserName()+"-"+req.getDeviceID());
+ log.debug(req.getType()+":
"+req.getUserName()+"-"+req.getDeviceID());
- Calendar calendar = null;
-
- calendar = new Calendar(syncManager.getLockedEvents(
+ Calendar calendar = new Calendar(syncManager.getLockedEvents(
req.getUserName()+req.getDeviceID()));
GetCalendarRequestResponse resp = (GetCalendarRequestResponse)
Index: SyncManager.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/calServer/SyncManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SyncManager.java 21 Dec 2004 14:31:03 -0000 1.6
+++ SyncManager.java 4 Jan 2005 13:46:06 -0000 1.7
@@ -253,6 +253,7 @@
unlockAndUpdateEvents(calendarID, null);
} catch (Exception e) {
+ log.error(e.getMessage());
} finally {
//Terminate the timer thread
