aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhristoterezov <hristo@jitsi.org>2014-05-27 14:16:02 +0300
committerhristoterezov <hristo@jitsi.org>2014-05-27 14:16:02 +0300
commit1806af75924a149aec5bb81e5b26a5f8521b203f (patch)
treef7361519eb946b48871844121577521345f798d7 /src
parent1a570fd44640c5623b3a26466cf014d6f7b7e499 (diff)
downloadjitsi-1806af75924a149aec5bb81e5b26a5f8521b203f.zip
jitsi-1806af75924a149aec5bb81e5b26a5f8521b203f.tar.gz
jitsi-1806af75924a149aec5bb81e5b26a5f8521b203f.tar.bz2
Fixes issue with sending chat messages using wrong resource ID.
Diffstat (limited to 'src')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
index b15414a..a6c06e6 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
@@ -304,7 +304,8 @@ public class OperationSetBasicInstantMessagingJabberImpl
if (ta != null
&& ta.chat != null
- && ta.jid.equals(jid))
+ && ta.jid.equals(jid)
+ && ta.chat.getParticipant().equals(jid))
{
return ta.chat;
}
@@ -324,7 +325,6 @@ public class OperationSetBasicInstantMessagingJabberImpl
}
};
-
//we don't have a thread for this chat, so let's create one.
Chat chat = jabberConnection.getChatManager()
.createChat(jid, msgListener);