Fix xcap to gracefully handle 200 ok responses with no content.

2 files changed, 15 insertions, 6 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java
index 41688c1..b981681 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java
@@ -865,7 +865,11 @@ public class ServerStoredContactListSipImpl
         }
         catch (XCapException e)
         {
-            logger.error(e);
+            logger.error("Error initializing serverside list!", e);
+
+            // if for some reason we cannot init the contact list
+            // disconnect xcap client
+            sipProvider.getXCapClient().disconnect();
         }
     }
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java
index 411a981..0ace782 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java
@@ -619,17 +619,22 @@ public class XCapClientImpl extends BaseHttpXCapClient implements XCapClient
                 }
                 throw new XCapException(errorMessage);
             }
+
+            // an empty list
+            if (StringUtils.isNullOrEmpty(response.getContentType())
+                    || (content == null || content.length == 0))
+            {
+                return null;
+            }
+
             if (!contentType.equals(response.getContentType()))
             {
                 String errorMessage = String.format(
                         "XCAP server returns invalid content type: %1s",
-                        contentType);
+                        response.getContentType());
                 throw new XCapException(errorMessage);
             }
-            if (content == null || content.length == 0)
-            {
-                return null;
-            }
+
             return new String(content, "UTF-8");
         }
         catch (IOException e)