Fixes NPE while running tests.

fix-message-formatting
Damian Minkov 12 years ago
parent df0ff191ae
commit d2a5a76a94

@ -5,6 +5,7 @@
*/
package net.java.sip.communicator.impl.globaldisplaydetails;
import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.service.protocol.globalstatus.*;
@ -295,8 +296,13 @@ public void publishStatus(
OperationSetPresence presence
= protocolProvider.getOperationSet(OperationSetPresence.class);
LoginManager loginManager
= GlobalDisplayDetailsActivator.getUIService().getLoginManager();
LoginManager loginManager = null;
UIService uiService = GlobalDisplayDetailsActivator.getUIService();
if(uiService != null)
{
loginManager = uiService.getLoginManager();
}
RegistrationState registrationState
= protocolProvider.getRegistrationState();
@ -313,7 +319,8 @@ public void publishStatus(
}
else
{
loginManager.setManuallyDisconnected(true);
if(loginManager != null)
loginManager.setManuallyDisconnected(true);
LoginManager.logoff(protocolProvider);
}
}
@ -329,7 +336,8 @@ else if (!status.isOnline()
&& !(registrationState
== RegistrationState.UNREGISTERING))
{
loginManager.setManuallyDisconnected(true);
if(loginManager != null)
loginManager.setManuallyDisconnected(true);
LoginManager.logoff(protocolProvider);
}

Loading…
Cancel
Save