diff --git a/client/pom.xml b/client/pom.xml index 66a23f7ae8217ef9a062fefdda23eacf8e7bc550..9943deb6f1df6e8df82fd78294f4460545213439 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.22</version> + <version>1.3.24</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 index 2f45950d0b03e549d16a7217bb95aff201a54a83..7dd7445a3cdd18869fb8ced115488fbe03c7efb1 100644 --- 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.22"; + public static final String VERSION = "Red5 Client 1.3.24"; /** * 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 index 8eb6ef3f3b4bf16cf9f832f1770cac3d81e3fe69..fa564a765c96828874f71ad78244710abdc5cb8b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.22</version> + <version>1.3.24</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.22</version> + <version>1.3.24</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 index 50d19349bb4d3b5c4eac344dd11e6d49bcfebd34..96e157190ee2d81d392405bb19a571933e48ffbf 100644 --- 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.22"; + public static final String VERSION = "Red5 Server 1.3.24"; /** * Server version for fmsVer requests */ - public static final String FMS_VERSION = "RED5/1,3,22,0"; + public static final String FMS_VERSION = "RED5/1,3,24,0"; /** * Server capabilities diff --git a/io/pom.xml b/io/pom.xml index f1314518354b36c9071a326925b2e954a6bdd329..95de65445cdf9aff675aeca392046d9d878d8554 100644 --- a/io/pom.xml +++ b/io/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.22</version> + <version>1.3.24</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-io</artifactId> diff --git a/pom.xml b/pom.xml index a364ed934abc7d3be58c94f1ab0d3ff7df0f3754..bf44f1150c6d16683274f0d106ec8a4dac630680 100644 --- 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.22</version> + <version>1.3.24</version> <url>https://github.com/Red5/red5-server</url> <inceptionYear>2005</inceptionYear> <organization> diff --git a/server/pom.xml b/server/pom.xml index e7795bcb5cded41d24be92f7b61000316d749da1..8b2b7f412f59a6c2b5f48209b1e6ba1577cce04e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.22</version> + <version>1.3.24</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 index 4fdb23bc19188263317d40b49cf94b809b3ff7d2..a991f5aa0d2a6bd0b78a07c67e5f4b2d420e573a 100644 --- a/server/src/main/java/org/red5/net/websocket/WebSocketConnection.java +++ b/server/src/main/java/org/red5/net/websocket/WebSocketConnection.java @@ -659,6 +659,21 @@ public class WebSocketConnection extends AttributeStore implements Comparable<We WebSocketConnection.readTimeout = readTimeout; } + public void setUserProperty(String key, Object value) { + WsSession wsSession = getWsSession(); + if (wsSession != null) { + wsSession.getUserProperties().put(key, value); + } + } + + public Object getUserProperty(String key) { + WsSession wsSession = getWsSession(); + if (wsSession.getUserProperties().get(key) != null) { + return wsSession.getUserProperties().get(key); + } + return null; + } + public void setWsSessionTimeout(long idleTimeout) { if (wsSession != null) { wsSession.get().setMaxIdleTimeout(idleTimeout); diff --git a/service/pom.xml b/service/pom.xml index bcdc53d44c71b4225067c2b54b68133617b00c11..a53a7408e049b15e40f1c0b191e901430622ad08 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.22</version> + <version>1.3.24</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-service</artifactId>