cvs commit: uwcal_JSR168/src/java/org/jahia/suite/calendar/syncServer CalendarManager.java

[Xavier Lawrence]

xlawrence    2004/12/08 17:07:57 CET

  Modified files:
    src/java/org/jahia/suite/calendar/syncServer 
                                                 CalendarManager.java 
  Log:
  Bug correction
  
  Revision  Changes    Path
  1.5       +7 -3      
uwcal_JSR168/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: CalendarManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CalendarManager.java      23 Nov 2004 10:30:18 -0000      1.4
  +++ CalendarManager.java      8 Dec 2004 16:07:56 -0000       1.5
  @@ -107,7 +107,7 @@
               tAgent.start();
           } catch (Exception e){
               log.fatal(e);
  -            System.exit(-1);
  +            throw new SyncException(e.getMessage(), e);
           }
           this.transportSender = tAgent;
           this.source = source;
  @@ -211,6 +211,7 @@
       public void loadCalendar(String userName, String deviceID, Timestamp 
since)
       throws SyncException {
           try {
  +            log.debug("loadCalendar: "+userName+"-"+deviceID);
               this.userName = userName;
               this.deviceID = deviceID;
               GetCalendarRequest req = new GetCalendarRequest(newID(), 
userName,
  @@ -221,11 +222,14 @@
               Calendar calendar = resp.getCalendar();
               
               SyncItem[] all = calendarToSyncItems(calendar);
  -            this.allItems = new Vector();
  +            log.debug("Number of calendar items returned: "+all.length);
  +            this.allItems = new Vector(all.length);
               for (int i=0; i<all.length; i++) {
                   this.allItems.addElement(all[i]);
               }
  +            
           } catch (Exception e) {
  +            e.printStackTrace();
               throw new SyncException(e.getMessage(), e);
           }
       }
  @@ -346,7 +350,7 @@
               SyncItem item = (SyncItem)ite.next();
               SyncEvent ev = new SyncEvent(item.getKey().getKeyAsString(),
               
(byte[])item.getProperty(SyncItem.PROPERTY_BINARY_CONTENT).getValue(),
  -            item.getState());
  +            StateValueConverter.toUWCal(item.getState()));
               SyncOperation op = new SyncOperation(operationType, ev);
               log.debug(op);
               result.addElement(op);