Fixes a possible NullPointerException which could prevent the successful integration of Jitsi presence, IM and VoIP into MS Outlook.

1 files changed, 14 insertions, 6 deletions

diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
index f1b4581..6058121 100644
--- a/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
@@ -438,13 +438,21 @@ public class Messenger
                     MetaContactListService.class);
 
         bundleContext.addServiceListener(serviceListener);
-        for (ServiceReference reference
-                : bundleContext.getServiceReferences(
-                        ProtocolProviderService.class.getName(),
-                        null))
+
+        ServiceReference[] serviceReferences
+            = bundleContext.getServiceReferences(
+                    ProtocolProviderService.class.getName(),
+                    null);
+
+        if ((serviceReferences != null) && (serviceReferences.length != 0))
         {
-            serviceListener.serviceChanged(
-                    new ServiceEvent(ServiceEvent.REGISTERED, reference));
+            for (ServiceReference serviceReference : serviceReferences)
+            {
+                serviceListener.serviceChanged(
+                        new ServiceEvent(
+                                ServiceEvent.REGISTERED,
+                                serviceReference));
+            }
         }
     }