aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2015-05-18 18:18:01 +0300
committerDamian Minkov <damencho@jitsi.org>2015-05-18 18:32:52 +0300
commit71e875d90c48c8c23bf38db50fd143f0268b7205 (patch)
treebd415948e820c7e4e973143c885bb0495d7fbbf8 /src/net/java/sip/communicator/impl
parent8518fe3151b7cb2be772cf495f0bc5279e23eab7 (diff)
downloadjitsi-71e875d90c48c8c23bf38db50fd143f0268b7205.zip
jitsi-71e875d90c48c8c23bf38db50fd143f0268b7205.tar.gz
jitsi-71e875d90c48c8c23bf38db50fd143f0268b7205.tar.bz2
Makes sure we do not try to process incoming reply errors for xmpp ping packets.
Diffstat (limited to 'src/net/java/sip/communicator/impl')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java
index 9a4bef0..ea56481 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java
@@ -169,10 +169,14 @@ public class KeepAliveManager
if(packet instanceof KeepAliveEvent)
{
// replay only to server pings, to avoid leak of presence
+ // skip if this is reply with error (like not supported)
+ // we can still receive errors, but as this is keep-alive ping
+ // we don't care for errors, as packets has already done its goal
KeepAliveEvent evt = (KeepAliveEvent)packet;
if(evt.getFrom() != null
&& evt.getFrom()
- .equals(parentProvider.getAccountID().getService()))
+ .equals(parentProvider.getAccountID().getService())
+ && evt.getError() == null)
{
parentProvider.getConnection().sendPacket(
IQ.createResultIQ(evt));