From 8bee35ad29fbf6f3a9b785d4ddf546529289dea3 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 31 Jan 2012 22:59:25 +0000
Subject: [PATCH] Caldav: fix NullPointerException on addressbook request

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1888 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/caldav/CaldavConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java
index 1691a9e7..4ccc960d 100644
--- a/src/java/davmail/caldav/CaldavConnection.java
+++ b/src/java/davmail/caldav/CaldavConnection.java
@@ -651,7 +651,7 @@ public class CaldavConnection extends AbstractConnection {
         if (request.getDepth() == 1) {
             if (folder.isContact()) {
                 appendContactsResponses(response, request, contacts);
-            } else {
+            } else if (folder.isCalendar() || folder.isTask()) {
                 appendEventsResponses(response, request, events);
                 // Send sub folders for multi-calendar support under iCal, except for public folders
                 if (folderList != null) {