vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 14:02:06 +01:00
Code Issues Releases Wiki Activity

ChatManager should not throw a NPE if 'from' is null

Browse source 
Fixes SMACK-551
This commit is contained in:
Florian Schmaus 2014-03-18 08:44:03 +01:00
parent ec82f63191
commit 81d49d2f60
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/src/main/java/org/jivesoftware/smack/ChatManager.java
View file

@ -149,6 +149,9 @@ public class ChatManager extends Manager{
if(chat == null) { if(chat == null) {
chat = createChat(message); chat = createChat(message);
} }
// The chat could not be created, abort here
if (chat == null)
return;
deliverMessage(chat, message); deliverMessage(chat, message);
} }
}, filter); }, filter);
@ -245,12 +248,24 @@ public class ChatManager extends Manager{
baseJidChats.remove(StringUtils.parseBareAddress(userJID)); baseJidChats.remove(StringUtils.parseBareAddress(userJID));
} }
/**
* Creates a new {@link Chat} based on the message. May returns null if no chat could be
* created, e.g. because the message comes without from.
*
* @param message
* @return a Chat or null if none can be created
*/
private Chat createChat(Message message) { private Chat createChat(Message message) {
String userJID = message.getFrom();
// According to RFC6120 8.1.2.1 4. messages without a 'from' attribute are valid, but they
// are of no use in this case for ChatManager
if (userJID == null) {
return null;
}
String threadID = message.getThread(); String threadID = message.getThread();
if(threadID == null) { if(threadID == null) {
threadID = nextID(); threadID = nextID();
} }
String userJID = message.getFrom();
return createChat(userJID, threadID, false); return createChat(userJID, threadID, false);
} }
@ -268,7 +283,11 @@ public class ChatManager extends Manager{
if (matchMode == MatchMode.NONE) { if (matchMode == MatchMode.NONE) {
return null; return null;
} }
// According to RFC6120 8.1.2.1 4. messages without a 'from' attribute are valid, but they
// are of no use in this case for ChatManager
if (userJID == null) {
return null;
}
Chat match = jidChats.get(userJID); Chat match = jidChats.get(userJID);
if (match == null && (matchMode == MatchMode.BARE_JID)) { if (match == null && (matchMode == MatchMode.BARE_JID)) {