Merge branch 'master' of https://github.com/jitsi/jitsi

src/net/java/sip/communicator/plugin/demuxcontactsource/DemuxContactSource.java

@@ -25,6 +25,11 @@
 public class DemuxContactSource
     implements ProtocolAwareContactSourceService
 {
+    /**
+     * The logger for this class.
+     */
+    private final Logger logger = Logger.getLogger(DemuxContactSource.class);
+
     /**
      * The underlying contact source service.
      */
@@ -96,7 +101,15 @@ public String getDisplayName()
      */
     public ContactQuery queryContactSource(String queryString)
     {
+        if (logger.isDebugEnabled())
+            logger.debug("Demux query contact source: " + contactSource
+                + " for string " + queryString);
+
+        if (queryString == null)
+            queryString = "";
+
         if (contactSource instanceof ExtendedContactSourceService)
+        {
             return new DemuxContactQuery(
                 ((ExtendedContactSourceService) contactSource)
                     .queryContactSource(Pattern.compile(
@@ -104,6 +117,7 @@ public ContactQuery queryContactSource(String queryString)
                         Pattern.MULTILINE
                             | Pattern.CASE_INSENSITIVE
                             | Pattern.UNICODE_CASE)));
+        }
         else
             return new DemuxContactQuery(
                 contactSource.queryContactSource(queryString));