Fixes NPE when disconnects from jabber server.

Fixes joining/creating chatrooms using google accounts.
Fixes an error parsing protocols in result records from NAPTR query.
cusax-fix
Damian Minkov 15 years ago
parent 7cdf558242
commit d4db845b8d

@ -477,7 +477,8 @@ public void contactPresenceStatusChanged(
ContactPresenceStatusChangeEvent evt)
{
// If the user goes offline we ensure to remove the caps node.
if (evt.getNewStatus().getStatus() < PresenceStatus.ONLINE_THRESHOLD)
if (capsManager != null
&& evt.getNewStatus().getStatus() < PresenceStatus.ONLINE_THRESHOLD)
capsManager.removeUserCapsNode(evt.getSourceContact().getAddress());
}
}

@ -111,6 +111,14 @@ public ChatRoom createChatRoom(
if (logger.isInfoEnabled())
logger.info("Find room returns null.");
// rooms using google servers needs a special name.
// in the form private-chat-UUID@groupchat.google.com
if(getXmppConnection().getHost().toLowerCase().contains("google"))
{
roomName = "private-chat-" +
UUID.randomUUID().toString() + "@groupchat.google.com";
}
MultiUserChat muc = null;
try
{

@ -750,7 +750,7 @@ private static String getProtocolFromNAPTRRecords(String service)
return "UDP";
else if(service.equalsIgnoreCase("SIP+D2T"))
return "TCP";
else if(service.equalsIgnoreCase("SIP+D2TS"))
else if(service.equalsIgnoreCase("SIPS+D2T"))
return "TLS";
else
return null;

Loading…
Cancel
Save