squash: Bump smack version and fix error already connected.

jitsi · Dec 5, 2024 · 216dd3a · 216dd3a
1 parent c0b74eb
commit 216dd3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/jicoco/src/main/java/org/jitsi/xmpp/mucclient/MucClient.java b/jicoco/src/main/java/org/jitsi/xmpp/mucclient/MucClient.java
@@ -235,17 +235,10 @@ public void reconnectionFailed(Exception e)
             // too quickly and prosody is not fully up ('invalid-namespace' error)
             if (MucClient.this.connectRetry != null && xmppConnection.isConnected())
             {
-                try
-                {
-                    xmppConnection.disconnect();
-                }
-                catch(Exception ex)
-                {
-                    logger.error("Error disconnecting xmpp connection", ex);
-                }
+                xmppConnection.instantShutdown();
 
                 MucClient.this.connectRetry.runRetryingTask(
-                        new SimpleRetryTask(0, 1000, true, getConnectAndLoginCallable()));
+                        new SimpleRetryTask(0, 2000, true, getConnectAndLoginCallable()));
             }
         }
     };
@@ -693,10 +686,7 @@ private Callable<Boolean> getConnectAndLoginCallable()
         {
             try
             {
-                if (!xmppConnection.isConnected())
-                {
-                    xmppConnection.connect();
-                }
+                xmppConnection.connect();
             }
             catch(Exception t)
             {

diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
         <jersey.version>3.0.10</jersey.version>
         <jwt.version>0.12.6</jwt.version>
         <bouncycastle.version>1.78.1</bouncycastle.version>
-        <smack.version>4.4.6</smack.version>
+        <smack.version>4.4.8</smack.version>
     </properties>
 
     <dependencyManagement>