Fix use of attributes as putIfAbsent for a SharedObject pair will not…

… check the value, only the key
Red5 · Aug 26, 2024 · dfd0ab5 · dfd0ab5
1 parent dfb2d23
commit dfd0ab5
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 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.34</version>
+        <version>1.3.35</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.34";
+    public static final String VERSION = "Red5 Client 1.3.35";
 
     /**
      * 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.34</version>
+        <version>1.3.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>net.engio</groupId>
             <artifactId>mbassador</artifactId>
-            <version>1.3.34</version>
+            <version>1.3.35</version>
         </dependency> -->
         <dependency>
             <groupId>junit</groupId>

diff --git a/common/src/main/java/org/red5/server/AttributeStore.java b/common/src/main/java/org/red5/server/AttributeStore.java
@@ -153,7 +153,7 @@ public boolean setAttribute(final String name, final Object value) {
         boolean result = false;
         if (name != null && value != null) {
             // get previous value
-            final Object previous = attributes.putIfAbsent(name, value);
+            final Object previous = attributes.put(name, value);
             // previous will be null if the attribute didn't exist and if it does it will equal the previous value
             if (previous != null) {
                 // if the value is a collection, check the elements for modification

diff --git a/common/src/main/java/org/red5/server/api/Red5.java b/common/src/main/java/org/red5/server/api/Red5.java
@@ -57,12 +57,12 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 1.3.34";
+    public static final String VERSION = "Red5 Server 1.3.35";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/1,3,34,0";
+    public static final String FMS_VERSION = "RED5/1,3,35,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.34</version>
+        <version>1.3.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <name>Red5</name>
     <description>The Red5 server</description>
     <groupId>org.red5</groupId>
-    <version>1.3.34</version>
+    <version>1.3.35</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.34</version>
+        <version>1.3.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

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.34</version>
+        <version>1.3.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-service</artifactId>

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