Added ws manager remove conn call

Red5 · Sep 27, 2022 · c568879 · c568879
1 parent 7e6e5a2
commit c568879
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 20 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-client</artifactId>

diff --git a/client/src/main/java/org/red5/client/Red5Client.java b/client/src/main/java/org/red5/client/Red5Client.java
@@ -18,7 +18,7 @@ public final class Red5Client {
     /**
      * Current server version with revision
      */
-    public static final String VERSION = "Red5 Client 1.3.4";
+    public static final String VERSION = "Red5 Client 1.3.5";
 
     /**
      * Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope

diff --git a/common/pom.xml b/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>net.engio</groupId>
             <artifactId>mbassador</artifactId>
-            <version>1.3.4</version>
+            <version>1.3.5</version>
         </dependency> -->
         <dependency>
             <groupId>junit</groupId>

diff --git a/common/src/main/java/org/red5/server/api/Red5.java b/common/src/main/java/org/red5/server/api/Red5.java
@@ -55,12 +55,12 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 1.3.4";
+    public static final String VERSION = "Red5 Server 1.3.5";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/1,3,4,0";
+    public static final String FMS_VERSION = "RED5/1,3,5,0";
 
     /**
      * Server capabilities

diff --git a/io/pom.xml b/io/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <name>Red5</name>
     <description>The Red5 server</description>
     <groupId>org.red5</groupId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <url>https://github.com/Red5/red5-server</url>
     <inceptionYear>2005</inceptionYear>
     <organization>

diff --git a/server/pom.xml b/server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

diff --git a/server/src/main/java/org/red5/net/websocket/WebSocketConnection.java b/server/src/main/java/org/red5/net/websocket/WebSocketConnection.java
@@ -322,16 +322,15 @@ public void close() {
         if (connected.compareAndSet(true, false)) {
             log.debug("close: {}", wsSessionId);
             WsSession session = wsSession != null ? wsSession.get() : null;
-            if (session != null && session.isOpen()) {
-                // clean up internal ws session maps since close doesnt
-                //if (session.isOpen()) {
-                //    session.getPathParameters().clear();
-                //    session.getUserProperties().clear();
-                //}
-                // ensure the endpoint is closed
-                CloseReason reason = new CloseReason(CloseCodes.GOING_AWAY, "");
-                // close the socket, don't wait for the browser to respond or we could hang
-                session.onClose(reason);
+            WebSocketScopeManager manager = null;
+            if (session != null) {
+                manager = (WebSocketScopeManager) session.getUserProperties().get(WSConstants.WS_MANAGER);
+                if (session.isOpen()) {
+                    // ensure the endpoint is closed
+                    CloseReason reason = new CloseReason(CloseCodes.GOING_AWAY, "");
+                    // close the socket, don't wait for the browser to respond or we could hang
+                    session.onClose(reason);
+                }
             }
             // clean up our props
             attributes.clear();
@@ -346,6 +345,10 @@ public void close() {
             if (headers != null) {
                 headers = null;
             }
+            // fire callback for manager
+            if (manager != null) {
+                manager.removeConnection(this);
+            }
             if (scope.get() != null) {
                 // disconnect from scope
                 scope.get().removeConnection(this);

diff --git a/service/pom.xml b/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-service</artifactId>