From bd69676be55769acb85e0617666b2eb45697b9ae Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 10 Mar 2014 22:34:26 +0000
Subject: [PATCH] Caldav: fix bug in VCalendar dtend check

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2254 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/exchange/VCalendar.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java/davmail/exchange/VCalendar.java b/src/java/davmail/exchange/VCalendar.java
index 1fa46a8f..2a38a9c3 100644
--- a/src/java/davmail/exchange/VCalendar.java
+++ b/src/java/davmail/exchange/VCalendar.java
@@ -243,7 +243,7 @@ public class VCalendar extends VObject {
                             dtStart.setParam("TZID", tzid);
                         }
                         VProperty dtEnd = vObject.getProperty("DTEND");
-                        if (dtEnd != null && dtStart.getParam("TZID") != null) {
+                        if (dtEnd != null && dtEnd.getParam("TZID") != null) {
                             dtEnd.setParam("TZID", tzid);
                         }
                         VProperty reccurrenceId = vObject.getProperty("RECURRENCE-ID");
@@ -256,7 +256,7 @@ public class VCalendar extends VObject {
                         List<String> toRemoveValues = null;
                         List<String> values = vObject.getProperty("ATTACH").getValues();
                         for (String value : values) {
-                            if (value.indexOf("CID:") >= 0) {
+                            if (value.contains("CID:")) {
                                 if (toRemoveValues == null) {
                                     toRemoveValues = new ArrayList<String>();
                                 }