[Bedework-commit] calendarapi r640 - trunk/icalendar/src/org/bedework/icalendar

svnadmin at bedework.org svnadmin at bedework.org
Wed May 28 13:45:04 EDT 2008


Author: douglm
Date: 2008-05-28 13:45:03 -0400 (Wed, 28 May 2008)
New Revision: 640

Modified:
   trunk/icalendar/src/org/bedework/icalendar/VEventUtil.java
Log:
Fix (via Roberto Polli) for null parameters in x-props

Modified: trunk/icalendar/src/org/bedework/icalendar/VEventUtil.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/VEventUtil.java	2008-05-24 03:54:06 UTC (rev 639)
+++ trunk/icalendar/src/org/bedework/icalendar/VEventUtil.java	2008-05-28 17:45:03 UTC (rev 640)
@@ -472,18 +472,20 @@
             List<BwXproperty.Xpar> pars = x.getParameters();
             ParameterList xparl = new ParameterList();
 
-            for (BwXproperty.Xpar xpar: pars) {
-              String xval = xpar.getValue();
-              if ((xval.indexOf(":") >= 0) ||
-                  (xval.indexOf(";") >= 0) ||
-                  (xval.indexOf(",") >= 0)) {
-                xval = "\"" + xval + "\"";
+            if (pars != null) {
+              for (BwXproperty.Xpar xpar: pars) {
+                String xval = xpar.getValue();
+                if ((xval.indexOf(":") >= 0) ||
+                    (xval.indexOf(";") >= 0) ||
+                    (xval.indexOf(",") >= 0)) {
+                  xval = "\"" + xval + "\"";
+                }
+
+                xparl.add(ParameterFactoryImpl.getInstance().createParameter(
+                    xpar.getName().toUpperCase(), xval));
               }
+            }
 
-              xparl.add(ParameterFactoryImpl.getInstance().createParameter(
-                               xpar.getName().toUpperCase(),
-                               xval));
-            }
             XProperty xp = new XProperty(x.getName(), xparl, x.getValue());
             pl.add(xp);
           }



More information about the Bedework-commit mailing list