diff options
| author | Damian Minkov <damencho@jitsi.org> | 2014-07-10 17:52:39 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-07-10 17:52:39 +0300 |
| commit | 256b6673f8e33ac400a07c021223c497cf849fb5 (patch) | |
| tree | 0a5082113a9a75f498afb826cb157ca5cb3c517c /src | |
| parent | c515f9bd00bfa10396a5f1cd9a8cb3d92a354b41 (diff) | |
| download | jitsi-256b6673f8e33ac400a07c021223c497cf849fb5.zip jitsi-256b6673f8e33ac400a07c021223c497cf849fb5.tar.gz jitsi-256b6673f8e33ac400a07c021223c497cf849fb5.tar.bz2 | |
Fixes IllegalArgumentException if otr is disabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/otr/OtrActivator.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/plugin/otr/OtrActivator.java b/src/net/java/sip/communicator/plugin/otr/OtrActivator.java index e69d9cf..6908778 100644 --- 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 class OtrActivator // 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 |