Skip to content

Commit 903d80f

Browse files
mondainmondain
committed
Update version to 2.0.16.44; Add IllegalStateEx handling for WS write when closed during write
1 parent b78ad56 commit 903d80f

11 files changed

Lines changed: 52 additions & 11 deletions

File tree

‎ci/deployment-update-instructions.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
Deployement of Red5 opensource update -
2+
3+
From the existing deployment, delete the existing red5 opensource jars:
4+
5+
/usr/local/red5pro
6+
red5-server.jar
7+
red5-service.jar
8+
9+
/usr/local/red5pro/lib
10+
red5-client-2.0.16.43.jar
11+
red5-io-2.0.16.43.jar
12+
red5-server-common-2.0.16.43.jar
13+
14+
Extract the red5-server-2.0.16.44.zip contents and copy:
15+
16+
from red5-server
17+
red5-server.jar
18+
red5-service.jar
19+
20+
into /usr/local/red5pro
21+
22+
from red5-server/lib
23+
red5-client-2.0.16.44.jar
24+
red5-io-2.0.16.44.jar
25+
red5-server-common-2.0.16.44.jar
26+
27+
into /usr/local/red5pro/lib
28+
29+
Lastly copy
30+
31+
red5-client-2.0.16.44.jar
32+
33+
into /usr/local/red5pro/lib
34+
35+
Restart red5pro

‎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>2.0.16.43</version>
6+
<version>2.0.16.44</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 2.0.16.43";
21+
public static final String VERSION = "Red5 Client 2.0.16.44";
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>2.0.16.43</version>
6+
<version>2.0.16.44</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server-common</artifactId>
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>net.engio</groupId>
107107
<artifactId>mbassador</artifactId>
108-
<version>2.0.16.43</version>
108+
<version>2.0.16.44</version>
109109
</dependency> -->
110110
<dependency>
111111
<groupId>junit</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public final class Red5 {
5757
/**
5858
* Server version with revision
5959
*/
60-
public static final String VERSION = "Red5 Server 2.0.16.43";
60+
public static final String VERSION = "Red5 Server 2.0.16.44";
6161

6262
/**
6363
* Server version for fmsVer requests
6464
*/
65-
public static final String FMS_VERSION = "RED5/2,0,16,43";
65+
public static final String FMS_VERSION = "RED5/2,0,16,44";
6666

6767
/**
6868
* 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>2.0.16.43</version>
6+
<version>2.0.16.44</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
@@ -24,7 +24,7 @@
2424
<name>Red5</name>
2525
<description>The Red5 server</description>
2626
<groupId>org.red5</groupId>
27-
<version>2.0.16.43</version>
27+
<version>2.0.16.44</version>
2828
<url>https://github.com/Red5/red5-server</url>
2929
<inceptionYear>2005</inceptionYear>
3030
<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>2.0.16.43</version>
6+
<version>2.0.16.44</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server</artifactId>

‎server/src/main/java/org/red5/net/websocket/WebSocketConnection.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ public void send(String data) throws UnsupportedEncodingException, IOException {
225225
updateWriteBytes(lengthToWrite);
226226
}
227227
}
228+
} catch (IllegalStateException e) {
229+
// Session closed between check and send - expected race condition during disconnect
230+
log.debug("Send text failed, session closed: {}", wsSessionId);
228231
} catch (Exception e) {
229232
log.warn("Send text exception", e);
230233
}
@@ -271,6 +274,9 @@ public void send(byte[] buf) throws IOException {
271274
updateWriteBytes(buf.length);
272275
}
273276
}
277+
} catch (IllegalStateException e) {
278+
// Session closed between check and send - expected race condition during disconnect
279+
log.debug("Send binary failed, session closed: {}", wsSessionId);
274280
} catch (Exception e) {
275281
log.warn("Send bytes exception", e);
276282
}

‎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>2.0.16.43</version>
6+
<version>2.0.16.44</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-service</artifactId>

0 commit comments

Comments
 (0)