Fixes IllegalArgumentException if otr is disabled.

11 years ago · 256b6673f8
parent c515f9bd00
commit 256b6673f8
1 changed files with 6 additions and 2 deletions
--- a/src/net/java/sip/communicator/plugin/otr/OtrActivator.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrActivator.java
@ -428,8 +428,12 @@ public void stop(BundleContext bc) throws Exception
        // Unregister transformation layer.
        // start listening for newly register or removed protocol providers
        bundleContext.removeServiceListener(this);
-        bundleContext.removeServiceListener(scOtrEngine);
-        bundleContext.removeServiceListener(otrContactManager);
+
+        if(scOtrEngine != null)
+            bundleContext.removeServiceListener(scOtrEngine);
+
+        if(otrContactManager != null)
+            bundleContext.removeServiceListener(otrContactManager);

        ServiceReference[] protocolProviderRefs;
        try