From 54706e3918ed39859e6ace44f1023c34dbddc481 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sun, 28 Dec 2014 00:47:31 +0100 Subject: [PATCH] Move lastStanzaReceived in processPacket of AbstractXMPPConnection. In worst case we loose a timestamp because handleUnparsablePacket threw an Exception. --- .../java/org/jivesoftware/smack/AbstractXMPPConnection.java | 5 +---- .../java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java index 1d2175f2d..b20042157 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -878,6 +878,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { * @param packet the packet to process. */ protected void processPacket(Packet packet) { + lastStanzaReceived = System.currentTimeMillis(); // Deliver the incoming packet to listeners. executorService.submit(new ListenerNotification(packet)); } @@ -1270,10 +1271,6 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { return lastStanzaReceived; } - protected void reportStanzaReceived() { - this.lastStanzaReceived = System.currentTimeMillis(); - } - protected final void asyncGo(Runnable runnable) { cachedExecutorService.execute(runnable); } diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java index d37af04e9..060cb80b2 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java @@ -996,7 +996,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { continue; } finally { clientHandledStanzasCount = SMUtils.incrementHeight(clientHandledStanzasCount); - reportStanzaReceived(); } processPacket(packet); break;