From 8ab20013a78b3f456dd89b3064827304e57eed76 Mon Sep 17 00:00:00 2001 From: mguessan Date: Thu, 5 Mar 2009 16:56:04 +0000 Subject: [PATCH] Caldav: Improved message on update and fixed Etag response header git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@424 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/caldav/CaldavConnection.java | 4 ++-- src/java/davmail/exchange/ExchangeSession.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java index 69f1c905..bfe9a11d 100644 --- a/src/java/davmail/caldav/CaldavConnection.java +++ b/src/java/davmail/caldav/CaldavConnection.java @@ -240,8 +240,8 @@ public class CaldavConnection extends AbstractConnection { ExchangeSession.EventResult eventResult = session.createOrUpdateEvent(paths[4], body, etag, noneMatch); if (eventResult.etag != null) { HashMap responseHeaders = new HashMap(); - responseHeaders.put("GetETag", eventResult.etag); - sendHttpResponse(eventResult.status, responseHeaders, "text/html", "", true); + responseHeaders.put("ETag", eventResult.etag); + sendHttpResponse(eventResult.status, responseHeaders, null, "", true); } else { sendHttpResponse(eventResult.status, true); } diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java index 502813b7..489f07ac 100644 --- a/src/java/davmail/exchange/ExchangeSession.java +++ b/src/java/davmail/exchange/ExchangeSession.java @@ -1550,7 +1550,11 @@ public class ExchangeSession { if (status == 0) { status = wdr.retrieveSessionInstance().executeMethod(putmethod); if (status == HttpURLConnection.HTTP_OK) { - LOGGER.warn("Overwritten event " + messageUrl); + if (etag != null) { + LOGGER.debug("Updated event " + messageUrl); + } else { + LOGGER.warn("Overwritten event " + messageUrl); + } } else if (status != HttpURLConnection.HTTP_CREATED) { LOGGER.warn("Unable to create or update message " + status + " " + putmethod.getStatusLine()); }