Skip to content

Commit 9beb38c

Browse files
committed
Updated for clearing connections from client as needed to prevent ghost disconnected entries
1 parent 8ae0506 commit 9beb38c

File tree

10 files changed

+22
-11
lines changed

10 files changed

+22
-11
lines changed

client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>1.3.17</version>
6+
<version>1.3.18</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-client</artifactId>

client/src/main/java/org/red5/client/Red5Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public final class Red5Client {
1818
/**
1919
* Current server version with revision
2020
*/
21-
public static final String VERSION = "Red5 Client 1.3.17";
21+
public static final String VERSION = "Red5 Client 1.3.18";
2222

2323
/**
2424
* Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope

common/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>1.3.17</version>
6+
<version>1.3.18</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server-common</artifactId>
@@ -124,7 +124,7 @@
124124
<dependency>
125125
<groupId>net.engio</groupId>
126126
<artifactId>mbassador</artifactId>
127-
<version>1.3.17</version>
127+
<version>1.3.18</version>
128128
</dependency> -->
129129
<dependency>
130130
<groupId>junit</groupId>

common/src/main/java/org/red5/server/BaseConnection.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,17 @@ public void initialize(IClient client) {
262262
}
263263
}
264264

265+
/**
266+
* Uninitializes client
267+
*/
268+
public void uninitialize() {
269+
// unregister client
270+
if (log.isTraceEnabled()) {
271+
log.trace("Unregistering previous client: {}", this.client);
272+
}
273+
((Client) this.client).unregister(this, true);
274+
}
275+
265276
/** {@inheritDoc} */
266277
public String getType() {
267278
return type.name().toLowerCase();

common/src/main/java/org/red5/server/Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class Client extends AttributeStore implements IClient {
5252
/**
5353
* Connections this client is associated with.
5454
*/
55-
protected transient CopyOnWriteArraySet<IConnection> connections = new CopyOnWriteArraySet<IConnection>();
55+
protected transient CopyOnWriteArraySet<IConnection> connections = new CopyOnWriteArraySet<>();
5656

5757
/**
5858
* Creation time as Timestamp

common/src/main/java/org/red5/server/api/Red5.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ public final class Red5 {
5555
/**
5656
* Server version with revision
5757
*/
58-
public static final String VERSION = "Red5 Server 1.3.17";
58+
public static final String VERSION = "Red5 Server 1.3.18";
5959

6060
/**
6161
* Server version for fmsVer requests
6262
*/
63-
public static final String FMS_VERSION = "RED5/1,3,17,0";
63+
public static final String FMS_VERSION = "RED5/1,3,18,0";
6464

6565
/**
6666
* Server capabilities

io/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>1.3.17</version>
6+
<version>1.3.18</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-io</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<name>Red5</name>
2424
<description>The Red5 server</description>
2525
<groupId>org.red5</groupId>
26-
<version>1.3.17</version>
26+
<version>1.3.18</version>
2727
<url>https://github.com/Red5/red5-server</url>
2828
<inceptionYear>2005</inceptionYear>
2929
<organization>

server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>1.3.17</version>
6+
<version>1.3.18</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server</artifactId>

service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>1.3.17</version>
6+
<version>1.3.18</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-service</artifactId>

0 commit comments

Comments
 (0)