LPS-30007

xieh · Sep 18, 2012 · f34a815 · f34a815
1 parent e7a4e84
commit f34a815
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/portal-impl/src/com/liferay/portal/verify/VerifyCalendar.java b/portal-impl/src/com/liferay/portal/verify/VerifyCalendar.java
@@ -20,6 +20,7 @@
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portlet.calendar.model.CalEvent;
 import com.liferay.portlet.calendar.service.CalEventLocalServiceUtil;
 
@@ -128,8 +129,12 @@ protected void verifyRecurrence() throws Exception {
 				long eventId = rs.getLong("eventId");
 				String recurrence = rs.getString("recurrence");
 
-				TZSRecurrence recurrenceObj =
-					(TZSRecurrence)jsonSerializer.fromJSON(recurrence);
+				TZSRecurrence recurrenceObj = null;
+
+				if (Validator.isNotNull(recurrence)) {
+					recurrenceObj =
+						(TZSRecurrence)jsonSerializer.fromJSON(recurrence);
+				}
 
 				String newRecurrence = JSONFactoryUtil.serialize(recurrenceObj);