Merge pull request #329 from Red5/bug/stable-dev392

Bug/stable dev392
Red5 · Aug 24, 2022 · 993ffba · 993ffba
2 parents c036f8a + f3ffaad
commit 993ffba
Show file tree

Hide file tree

Showing 527 changed files with 3,183 additions and 3,183 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.2.24</version>
+        <version>1.2.31</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-client</artifactId>

diff --git a/client/src/main/java/org/red5/client/PublishModes.java b/client/src/main/java/org/red5/client/PublishModes.java
@@ -18,7 +18,7 @@
  * recording it. If a file with a name that matches the value passed to the name parameter exists, it is deleted.
  *
  * @author Stoian Ivanov (s.ivanov_at_teracomm.bg)
- * 
+ *
  */
 public final class PublishModes {
 

diff --git a/client/src/main/java/org/red5/client/Red5Client.java b/client/src/main/java/org/red5/client/Red5Client.java
@@ -9,7 +9,7 @@
 
 /**
  * Utility class for accessing Red5 "client" objects.
- * 
+ *
  * @author The Red5 Project
  * @author Paul Gregoire (mondain@gmail.com)
  */
@@ -18,7 +18,7 @@ public final class Red5Client {
     /**
      * Current server version with revision
      */
-    public static final String VERSION = "Red5 Client 1.2.24";
+    public static final String VERSION = "Red5 Client 1.2.31";
 
     /**
      * Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope
@@ -29,7 +29,7 @@ public Red5Client() {
 
     /**
      * Returns the current version with revision number
-     * 
+     *
      * @return String version
      */
     public static String getVersion() {

diff --git a/client/src/main/java/org/red5/client/StreamRelay.java b/client/src/main/java/org/red5/client/StreamRelay.java
@@ -28,7 +28,7 @@
 
 /**
  * Relay a stream from one location to another via RTMP.
- * 
+ *
  * @author Paul Gregoire (mondain@gmail.com)
  */
 public class StreamRelay {
@@ -47,7 +47,7 @@ public class StreamRelay {
 
     /**
      * Creates a stream client to consume a stream from an end point and a proxy to relay the stream to another end point.
-     * 
+     *
      * @param args
      *            application arguments
      */

diff --git a/client/src/main/java/org/red5/client/net/remoting/DSRemotingClient.java b/client/src/main/java/org/red5/client/net/remoting/DSRemotingClient.java
@@ -36,7 +36,7 @@
 
 /**
  * Client interface for remoting calls directed at an LCDS or BlazeDS style service.
- * 
+ *
  * @author The Red5 Project
  * @author Paul Gregoire (mondain@gmail.com)
  */
@@ -59,7 +59,7 @@ public DSRemotingClient() {
 
     /**
      * Create new remoting client for the given url.
-     * 
+     *
      * @param url
      *            URL to connect to
      */
@@ -78,7 +78,7 @@ public void setDataSourceId(String dataSourceId) {
 
     /**
      * Encode the method call.
-     * 
+     *
      * @param method
      *            Remote method being called
      * @param params
@@ -116,7 +116,7 @@ private IoBuffer encodeInvoke(String method, Object[] params) {
         Output.putString(result, method);
         // Client callback for response
         //Output.putString(result, "");
-        //responseURI 
+        //responseURI
         Output.putString(result, "/" + sequenceCounter++);
         // Serialize parameters
         IoBuffer tmp = IoBuffer.allocate(1024);
@@ -142,7 +142,7 @@ private IoBuffer encodeInvoke(String method, Object[] params) {
 
     /**
      * Process any headers sent in the response.
-     * 
+     *
      * @param in
      *            Byte buffer with response data
      */
@@ -199,7 +199,7 @@ protected void processHeaders(IoBuffer in) {
 
     /**
      * Decode response received from remoting server.
-     * 
+     *
      * @param data
      *            Result data to decode
      * @return Object deserialized from byte buffer data
@@ -217,7 +217,7 @@ private Object decodeResult(IoBuffer data) {
             log.debug("NUL: {}", b); //0
             log.debug("SOH: {}", data.get()); //1
         } else if (b == 1) {
-            log.debug("SOH: {}", b); //1			
+            log.debug("SOH: {}", b); //1
         }
 
         int targetUriLength = data.getShort();
@@ -261,7 +261,7 @@ private Object decodeResult(IoBuffer data) {
 
     /**
      * Invoke a method synchronously on the remoting server.
-     * 
+     *
      * @param method
      *            Method name
      * @param params
@@ -322,7 +322,7 @@ public Object invokeMethod(String method, Object[] params) {
 
     /**
      * Used for debugging byte stream.
-     * 
+     *
      * @param data
      *            IoBuffer
      */
@@ -392,7 +392,7 @@ public static void main(String[] args) {
             do {
                 Thread.sleep(5000);
                 log.info("Done with sleeping");
-                //send poll 
+                //send poll
                 //0 messages - returns DSK
                 //n messages - CommandMessage with internal DSA
                 msg = new CommandMessage();