From eb1187e5ea357a862d6161eafa0f5eaae38f7ed3 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Fri, 27 Feb 2009 11:45:38 +0000
Subject: [PATCH] Fix NullpointerException with CAS single signon form

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

diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 3a004170..cf04f8a2 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -147,16 +147,19 @@ public class ExchangeSession {
     }
 
     protected String getAbsolutePath(HttpMethod method, String path) {
-        String absolutePath = path;
-        // allow relative path
-        if (!absolutePath.startsWith("/")) {
+        if (path == null) {
+            return method.getPath();
+        } else if (path.startsWith("/")) {
+            return path;
+        } else {
             String currentPath = method.getPath();
             int end = currentPath.lastIndexOf('/');
             if (end >= 0) {
-                absolutePath = currentPath.substring(0, end + 1) + absolutePath;
+                return currentPath.substring(0, end + 1) + path;
+            } else {
+                return path;
             }
         }
-        return absolutePath;
     }
 
     /**