xlawrence 2005/02/07 17:17:52 CET
Modified files:
calClient/src/java/org/jahia/suite/calendar/calServer
UwCalConnector.java
Revision Changes Path
1.17 +14 -5
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java.diff?r1=1.16&r2=1.17&f=h
Index: UwCalConnector.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- UwCalConnector.java 4 Feb 2005 08:16:14 -0000 1.16
+++ UwCalConnector.java 7 Feb 2005 16:17:52 -0000 1.17
@@ -58,6 +58,7 @@
import java.io.IOException;
import java.util.Collection;
+import java.util.Vector;
import java.util.Iterator;
import org.apache.log4j.Logger;
@@ -74,12 +75,15 @@
*/
public class UwCalConnector implements Storable {
+ /**
+ * Constant for the UWCalWebURIgen
+ */
+ public static final String WEB_URI = "http://cal.rpi.edu";;
+
// log4j logger
static Logger log = Logger.getLogger(UwCalConnector.class);
public static final String CRLF = "\r\n";
-
- private URIgen urigen;
private String privateUser;
private String devid;
@@ -98,8 +102,9 @@
log.debug("New UwCalConnector for: "+userName+"-"+deviceID);
try {
- urigen = new UWCalWebURIgen("http://cal.rpi.edu";);
- calServer = new Synch(privateUser, devid, urigen,
log.isDebugEnabled());
+ final URIgen urigen = new UWCalWebURIgen(WEB_URI);
+ calServer = new Synch(privateUser, devid, urigen,
+ log.isDebugEnabled());
} catch (Exception e) {
throw new SyncException(e.getMessage(), e);
@@ -115,6 +120,9 @@
log.debug("uwCal: getAllEvents for :"+privateUser+"-"+devid);
try {
Collection c = calServer.getAllVevents();
+
+ if (c == null) c = new Vector(0);
+
SyncEvent[] res = new SyncEvent[c.size()];
Iterator it = c.iterator();
@@ -129,7 +137,8 @@
if (state != SynchStateVO.DELETED) {
content = event.getVevent().toString().getBytes();
} else {
- content = new byte[0];
+ // Don't send the content of a DELETED event
+ content = new byte[0];
}
res[i] = new SyncEvent(new GUID(event.getGuid()),
