From d944040f918975f7a011e7141f5119734ffc71db Mon Sep 17 00:00:00 2001
From: Paul Gregoire <mondain@gmail.com>
Date: Mon, 23 Oct 2023 11:02:54 -0700
Subject: [PATCH] Update Tomcat to 8.5.95; implemented new getLock in
 WsRemoteEndpointImplBase. Bumped version to 1.3.22

---
 client/pom.xml                                            | 2 +-
 client/src/main/java/org/red5/client/Red5Client.java      | 2 +-
 common/pom.xml                                            | 4 ++--
 common/src/main/java/org/red5/server/api/Red5.java        | 4 ++--
 io/pom.xml                                                | 2 +-
 pom.xml                                                   | 4 ++--
 server/pom.xml                                            | 2 +-
 .../net/websocket/server/WsRemoteEndpointImplServer.java  | 8 ++++++++
 service/pom.xml                                           | 2 +-
 9 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 8119adc08..66a23f7ae 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.21</version>
+        <version>1.3.22</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 b8b76b62f..2f45950d0 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.21";
+    public static final String VERSION = "Red5 Client 1.3.22";
 
     /**
      * 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 45ac69d58..8eb6ef3f3 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.21</version>
+        <version>1.3.22</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.21</version>
+            <version>1.3.22</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 58b65cd5c..50d19349b 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.21";
+    public static final String VERSION = "Red5 Server 1.3.22";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/1,3,21,0";
+    public static final String FMS_VERSION = "RED5/1,3,22,0";
 
     /**
      * Server capabilities
diff --git a/io/pom.xml b/io/pom.xml
index eaab8512b..f13145183 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.21</version>
+        <version>1.3.22</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>
diff --git a/pom.xml b/pom.xml
index 4eb659cd1..a364ed934 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.21</version>
+    <version>1.3.22</version>
     <url>https://github.com/Red5/red5-server</url>
     <inceptionYear>2005</inceptionYear>
     <organization>
@@ -101,7 +101,7 @@
         <mina.version>2.0.23</mina.version>
         <!-- Can no longer open-end spring, 6.0 forces jdk 17 -->
         <spring.version>5.3.24</spring.version>
-        <tomcat.version>8.5.87</tomcat.version>
+        <tomcat.version>8.5.95</tomcat.version>
         <junit.version>[4.13.1,)</junit.version>
         <isoparser.version>1.9.39</isoparser.version>
         <tika.version>1.26</tika.version>
diff --git a/server/pom.xml b/server/pom.xml
index c9cec46c9..e7795bcb5 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.21</version>
+        <version>1.3.22</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>
diff --git a/server/src/main/java/org/red5/net/websocket/server/WsRemoteEndpointImplServer.java b/server/src/main/java/org/red5/net/websocket/server/WsRemoteEndpointImplServer.java
index 761ea6a4e..10e91b7fd 100644
--- a/server/src/main/java/org/red5/net/websocket/server/WsRemoteEndpointImplServer.java
+++ b/server/src/main/java/org/red5/net/websocket/server/WsRemoteEndpointImplServer.java
@@ -5,6 +5,7 @@
 import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.Executor;
+import java.util.concurrent.locks.Lock;
 
 import javax.websocket.SendHandler;
 import javax.websocket.SendResult;
@@ -147,6 +148,13 @@ protected void doClose() {
         wsWriteTimeout.unregister(this);
     }
 
+    // XXX(paul) new method after tomcat 8.5.87
+    @Override
+    protected Lock getLock() {
+        // for a lack of better implementation, we use the socket wrapper lock
+        return socketWrapper.getLock();
+    }
+
     protected long getTimeoutExpiry() {
         return timeoutExpiry;
     }
diff --git a/service/pom.xml b/service/pom.xml
index ab31332b5..bcdc53d44 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.21</version>
+        <version>1.3.22</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-service</artifactId>