Fix possible bugs:

- Fix incorrect "compare" method in the TimeZoneDefinition class
- Fix NPE in the AttachmentCollection class
- Fix incorrect casting in the ComplexPropertyDefinitionBase class

Author: vbauer

src/main/java/microsoft/exchange/webservices/data/property/complex/AttachmentCollection.java

@@ -383,30 +383,31 @@ public void validate() throws Exception {
       for (int attachmentIndex = 0; attachmentIndex < this.getAddedItems()
           .size(); attachmentIndex++) {
         final Attachment attachment = this.getAddedItems().get(attachmentIndex);
-        if (attachment != null && attachment.isNew() && attachment instanceof FileAttachment) {
-          // At the server side, only the last attachment with
-          // IsContactPhoto is kept, all other IsContactPhoto
-          // attachments are removed. CreateAttachment will generate
-          // AttachmentId for each of such attachments (although
-          // only the last one is valid).
-          //
-          // With E14 SP2 CreateItemWithAttachment, such request will only
-          // return 1 AttachmentId; but the client
-          // expects to see all, so let us prevent such "invalid" request
-          // in the first place.
-          //
-          // The IsNew check is to still let CreateAttachmentRequest allow
-          // multiple IsContactPhoto attachments.
-          //
-          if (((FileAttachment) attachment).isContactPhoto()) {
-            if (contactPhotoFound) {
-              throw new ServiceValidationException(
-                  "Multiple contact photos in attachment.");
+        if (attachment != null) {
+          if (attachment.isNew() && attachment instanceof FileAttachment) {
+            // At the server side, only the last attachment with
+            // IsContactPhoto is kept, all other IsContactPhoto
+            // attachments are removed. CreateAttachment will generate
+            // AttachmentId for each of such attachments (although
+            // only the last one is valid).
+            //
+            // With E14 SP2 CreateItemWithAttachment, such request will only
+            // return 1 AttachmentId; but the client
+            // expects to see all, so let us prevent such "invalid" request
+            // in the first place.
+            //
+            // The IsNew check is to still let CreateAttachmentRequest allow
+            // multiple IsContactPhoto attachments.
+            //
+            if (((FileAttachment) attachment).isContactPhoto()) {
+              if (contactPhotoFound) {
+                throw new ServiceValidationException("Multiple contact photos in attachment.");
+              }
+              contactPhotoFound = true;
             }
-            contactPhotoFound = true;
           }
+          attachment.validate(attachmentIndex);
         }
-        attachment.validate(attachmentIndex);
       }
     }
   }

src/main/java/microsoft/exchange/webservices/data/property/complex/time/TimeZoneDefinition.java

@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -109,20 +110,21 @@ public class TimeZoneDefinition extends ComplexProperty implements Comparator<Ti
    * positive number if x is greater than y.
    */
   @Override
-  public int compare(TimeZoneTransition x, TimeZoneTransition y) {
+  public int compare(final TimeZoneTransition x, final TimeZoneTransition y) {
     if (x == y) {
       return 0;
-    } else if (x instanceof TimeZoneTransition) {
-      return -1;
-    } else if (y instanceof TimeZoneTransition) {
-      return 1;
-    } else {
-      AbsoluteDateTransition firstTransition = (AbsoluteDateTransition) x;
-      AbsoluteDateTransition secondTransition = (AbsoluteDateTransition) y;
+    } else if (x != null && y != null) {
+      final AbsoluteDateTransition firstTransition = (AbsoluteDateTransition) x;
+      final AbsoluteDateTransition secondTransition = (AbsoluteDateTransition) y;
 
-      return firstTransition.getDateTime().compareTo(
-          secondTransition.getDateTime());
+      final Date firstDateTime = firstTransition.getDateTime();
+      final Date secondDateTime = secondTransition.getDateTime();
+
+      return firstDateTime.compareTo(secondDateTime);
+    } else if (y == null) {
+      return 1;
     }
+    return -1;
   }
 
   /**

src/main/java/microsoft/exchange/webservices/data/property/definition/ComplexPropertyDefinitionBase.java

@@ -99,26 +99,15 @@ protected void internalLoadFromXml(EwsServiceXmlReader reader,
     boolean justCreated = getPropertyInstance(propertyBag, complexProperty);
     if (!justCreated && this.hasFlag(PropertyDefinitionFlags.UpdateCollectionItems,
         propertyBag.getOwner().getService().getRequestedServerVersion())) {
-      ComplexProperty c = (ComplexProperty) complexProperty.getParam();
-      if (complexProperty.getParam() instanceof ComplexProperty) {
-        c.updateFromXml(reader, reader.getLocalName());
+      Object c = complexProperty.getParam();
+      if (c instanceof ComplexProperty) {
+        ((ComplexProperty) c).updateFromXml(reader, reader.getLocalName());
       }
-
-
-
     } else {
       ComplexProperty c = (ComplexProperty) complexProperty.getParam();
       c.loadFromXml(reader, reader.getLocalName());
     }
-                /*if (!propertyBag.tryGetValue(this, complexProperty) ||
-                                 !this.hasFlag(PropertyDefinitionFlags.ReuseInstance)) {
-			complexProperty.setParam(this.createPropertyInstance(propertyBag
-					.getOwner()));
-		}
-		if (complexProperty.getParam() instanceof ComplexProperty) {
-			ComplexProperty c = (ComplexProperty)complexProperty.getParam();
-			c.loadFromXml(reader, reader.getLocalName());
-		}*/
+
     propertyBag.setObjectFromPropertyDefinition(this, complexProperty
         .getParam());
   }