commit b76a67d3034e65fb6d5d2de2ed3728e44180e651
author Marc Blank <mblank@google.com> Mon Mar 15 14:35:57 2010 -0700
committer Marc Blank <mblank@google.com> Mon Mar 15 15:35:59 2010 -0700
tree 1df0b862ad2d497b2f6c7fcc5eaedb7a8c15dcd3
parent c18ba7b3db166064d1ff7f2213dc103a94fdf9a2

Fix NPE in exception parsing

Bug: 2516099
Change-Id: I4d64c306f2c0421f0145dab11f10bfb174e46c0a

src/com/android/exchange/adapter/CalendarSyncAdapter.java

diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 49f9ca5..8085eeb 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -248,7 +248,7 @@
             long endTime = -1;
 
             // Keep track of the attendees; exceptions will need them
-            ArrayList<ContentValues> attendeeValues = null;
+            ArrayList<ContentValues> attendeeValues = new ArrayList<ContentValues>();
             int reminderMins = -1;
 
             while (nextTag(Tags.SYNC_APPLICATION_DATA) != END) {
@@ -603,8 +603,10 @@
             int exceptionStart = ops.mCount;
             ops.newException(cv);
             // Also add the attendees, because they need to be copied over from the parent event
-            for (ContentValues attValues: attendeeValues) {
-                ops.newAttendee(attValues, exceptionStart);
+            if (attendeeValues != null) {
+                for (ContentValues attValues: attendeeValues) {
+                    ops.newAttendee(attValues, exceptionStart);
+                }
             }
             // And add the parent's reminder value
             if (reminderMins > 0) {