[Bedework-commit] caldavimpl r109 - trunk/bwcaldav/src/org/bedework/caldav/bwserver

[svnadmin at bedework.org]

Author: douglm
Date: 2011-07-21 22:33:39 -0400 (Thu, 21 Jul 2011)
New Revision: 109

Modified:
   trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwUpdates.java
Log:
Further updates to SOAP update

Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwUpdates.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwUpdates.java	2011-07-21 15:37:01 UTC (rev 108)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwUpdates.java	2011-07-22 02:33:39 UTC (rev 109)
@@ -134,12 +134,14 @@
       return addOverride(ei, sel);
     }
 
+    JAXBElement ent = sel.getVcalendarContainedComponent();
+
     // Must be a component matching the current one.
-    if (sel.getBaseComponent() == null) {
+    if (ent == null) {
       return new UpdateResult("Missing component to match");
     }
 
-    int entType = entTypes.get(sel.getBaseComponent().getName());
+    int entType = entTypes.get(ent.getName());
     if (entType != ei.getEvent().getEntityType()) {
       return new UpdateResult("Mp matching entity");
     }
@@ -149,7 +151,8 @@
     entities.add(ei);
     entities.addAll(ei.getOverrides());
 
-    entities = match(entities, sel);
+    entities = match(entities, sel,
+                     (BaseComponentType)ent.getValue());
 
     if ((entities == null) || (entities.size() == 0)) {
       return new UpdateResult("Mp matching entity");
@@ -193,11 +196,10 @@
 
   /* Return matching entities. */
   private List<EventInfo> match(final List<EventInfo> eis,
-                                final SelectElementType sel) throws WebdavException {
+                                final SelectElementType sel,
+                                final BaseComponentType selComp) throws WebdavException {
     List<EventInfo> matched = new ArrayList<EventInfo>();
 
-    BaseComponentType selComp = sel.getBaseComponent().getValue();
-
     CompSelector cs = getCompSelector(selComp);
 
     for (EventInfo ei: eis) {