From dc780ffd6ccac71f1fa2d954cdbc27cfd1649b7d Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 4 Feb 2019 09:49:51 +0100 Subject: [PATCH] Make sendStanza() final --- .../java/org/jivesoftware/smack/AbstractXMPPConnection.java | 3 +-- .../java/org/jivesoftware/smack/ThreadedDummyConnection.java | 5 ++--- 2 files changed, 3 insertions(+), 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 75b1c297b..1bdbf9fd9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -738,9 +738,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } } - // TODO: This method should be final. @Override - public void sendStanza(Stanza stanza) throws NotConnectedException, InterruptedException { + public final void sendStanza(Stanza stanza) throws NotConnectedException, InterruptedException { Objects.requireNonNull(stanza, "Stanza must not be null"); assert (stanza instanceof Message || stanza instanceof Presence || stanza instanceof IQ); diff --git a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java index 02fbd9739..1e66ead8c 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java @@ -23,7 +23,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Level; import java.util.logging.Logger; -import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.packet.Message; @@ -42,8 +41,8 @@ public class ThreadedDummyConnection extends DummyConnection { private volatile boolean timeout = false; @Override - public void sendStanza(Stanza packet) throws NotConnectedException, InterruptedException { - super.sendStanza(packet); + protected void sendStanzaInternal(Stanza packet) { + super.sendStanzaInternal(packet); if (packet instanceof IQ && !timeout) { timeout = false;