Skip to content

Commit f956555

Browse files
mondainmondain
committed
Add property notify to IConnection interface with default no-op
1 parent f9de7e7 commit f956555

File tree

11 files changed

+30
-20
lines changed

11 files changed

+30
-20
lines changed

‎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.12</version>
6+
<version>2.0.13</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.12";
21+
public static final String VERSION = "Red5 Client 2.0.13";
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.12</version>
6+
<version>2.0.13</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.12</version>
108+
<version>2.0.13</version>
109109
</dependency> -->
110110
<dependency>
111111
<groupId>junit</groupId>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package org.red5.server.api;
99

10+
import java.beans.PropertyChangeEvent;
1011
import java.util.Iterator;
1112
import java.util.List;
1213
import java.util.Map;
@@ -302,4 +303,13 @@ static enum Type {
302303
*/
303304
String getProtocol();
304305

306+
/**
307+
* Notifies listeners of a property change.
308+
*
309+
* @param evt PropertyChangeEvent containing details
310+
*/
311+
default void notifyPropertyChanged(PropertyChangeEvent evt) {
312+
// no-op
313+
}
314+
305315
}

‎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.12";
60+
public static final String VERSION = "Red5 Server 2.0.13";
6161

6262
/**
6363
* Server version for fmsVer requests
6464
*/
65-
public static final String FMS_VERSION = "RED5/2,0,12,0";
65+
public static final String FMS_VERSION = "RED5/2,0,13,0";
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.12</version>
6+
<version>2.0.13</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-io</artifactId>

‎pom.xml

Lines changed: 6 additions & 6 deletions
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.12</version>
27+
<version>2.0.13</version>
2828
<url>https://github.com/Red5/red5-server</url>
2929
<inceptionYear>2005</inceptionYear>
3030
<organization>
@@ -101,17 +101,17 @@
101101
<red5-service.version>${project.version}</red5-service.version>
102102
<slf4j.version>2.0.13</slf4j.version>
103103
<logback.version>1.5.6</logback.version>
104-
<bc.version>1.78.1</bc.version>
104+
<bc.version>1.79</bc.version>
105105
<mina.version>2.0.23</mina.version>
106106
<spring.version>6.2.0</spring.version>
107-
<tomcat.version>11.0.1</tomcat.version>
107+
<tomcat.version>11.0.2</tomcat.version>
108108
<junit.version>[4.13.1,)</junit.version>
109109
<isoparser.version>1.9.59</isoparser.version>
110110
<ehcache.version>2.10.6</ehcache.version>
111-
<commons-beanutils.version>1.9.4</commons-beanutils.version>
112-
<commons-codec.version>1.17.1</commons-codec.version>
111+
<commons-beanutils.version>1.10.0</commons-beanutils.version>
112+
<commons-codec.version>1.17.2</commons-codec.version>
113113
<commons-collections.version>4.4</commons-collections.version>
114-
<commons-io.version>2.17.0</commons-io.version>
114+
<commons-io.version>2.18.0</commons-io.version>
115115
<commons-lang3.version>3.17.0</commons-lang3.version>
116116
<httpcore.version>[4.4.11,)</httpcore.version>
117117
<httpclient.version>[4.5.13,)</httpclient.version>

‎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.12</version>
6+
<version>2.0.13</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server</artifactId>

‎server/src/main/java/org/red5/server/net/rtmp/InboundHandshake.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public IoBuffer doHandshake(IoBuffer in) {
7878
*/
7979
public IoBuffer decodeClientRequest1(IoBuffer in) {
8080
if (log.isTraceEnabled()) {
81-
log.debug("decodeClientRequest1: {}", Hex.encodeHexString(in.array()));
81+
log.trace("decodeClientRequest1: {}", Hex.encodeHexString(in.array()));
8282
}
8383
// copy into a new array to ensure the position is respected
8484
c1 = new byte[Constants.HANDSHAKE_SIZE];
@@ -175,7 +175,7 @@ public IoBuffer decodeClientRequest1(IoBuffer in) {
175175
if (useEncryption()) {
176176
switch (handshakeType) {
177177
case RTMPConnection.RTMP_ENCRYPTED:
178-
log.debug("RTMPE type 6");
178+
log.debug("RTMPE type 6 - C1");
179179
// we dont encrypt signatureResp for type 6
180180
break;
181181
case RTMPConnection.RTMP_ENCRYPTED_XTEA:
@@ -225,7 +225,7 @@ public IoBuffer decodeClientRequest1(IoBuffer in) {
225225
*/
226226
public boolean decodeClientRequest2(IoBuffer in) {
227227
if (log.isTraceEnabled()) {
228-
log.debug("decodeClientRequest2: {}", Hex.encodeHexString(in.array()));
228+
log.trace("decodeClientRequest2: {}", Hex.encodeHexString(in.array()));
229229
}
230230
byte[] c2 = new byte[Constants.HANDSHAKE_SIZE];
231231
in.get(c2);
@@ -240,7 +240,7 @@ public boolean decodeClientRequest2(IoBuffer in) {
240240
if (useEncryption()) {
241241
switch (handshakeType) {
242242
case RTMPConnection.RTMP_ENCRYPTED:
243-
log.debug("RTMPE type 6");
243+
log.debug("RTMPE type 6 - C2");
244244
break;
245245
case RTMPConnection.RTMP_ENCRYPTED_XTEA:
246246
log.debug("RTMPE type 8 XTEA");

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

‎servlet/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.12</version>
6+
<version>2.0.13</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-servlet</artifactId>

0 commit comments

Comments
 (0)