From 913a4d76e89ea7b990dd1b0af9f677408a377105 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 28 Jun 2011 22:24:55 +0000
Subject: [PATCH] Caldav: fix regression on iCal FreeBusy handling

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

diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index ac82f8a6..d21e6cd2 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -2773,7 +2773,7 @@ public abstract class ExchangeSession {
      * @return fixed value
      */
     protected String replaceIcal4Principal(String value) {
-        if (value.contains("/principals/__uuids__/")) {
+        if (value != null && value.contains("/principals/__uuids__/")) {
             return value.replaceAll("/principals/__uuids__/([^/]*)__AT__([^/]*)/", "mailto:$1@$2");
         } else {
             return value;
@@ -3216,12 +3216,14 @@ public abstract class ExchangeSession {
      * @throws IOException on error
      */
     public FreeBusy getFreebusy(String attendee, String startDateValue, String endDateValue) throws IOException {
-        // first check that email address is valid to avoid InvalidSmtpAddress error
+        // replace ical encoded attendee name
+        attendee = replaceIcal4Principal(attendee);
+
+        // then check that email address is valid to avoid InvalidSmtpAddress error
         if (attendee == null || attendee.indexOf('@') < 0 || attendee.charAt(attendee.length() - 1) == '@') {
             return null;
         }
 
-        attendee = replaceIcal4Principal(attendee);
         if (attendee.startsWith("mailto:") || attendee.startsWith("MAILTO:")) {
             attendee = attendee.substring("mailto:".length());
         }