Updates for 1.0.9-M8

Red5 · Apr 12, 2017 · 6ed64cd · 6ed64cd
1 parent 625eb77
commit 6ed64cd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.0.9-M7</version>
+        <version>1.0.9-M8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

diff --git a/src/main/java/org/red5/server/net/rtmp/RTMPConnManager.java b/src/main/java/org/red5/server/net/rtmp/RTMPConnManager.java
@@ -61,7 +61,7 @@ public class RTMPConnManager implements IConnectionManager<RTMPConnection>, Appl
 
     private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1, new CustomizableThreadFactory("ConnectionChecker-"));
 
-    protected ConcurrentMap<String, RTMPConnection> connMap = new ConcurrentHashMap<String, RTMPConnection>();
+    protected ConcurrentMap<String, RTMPConnection> connMap = new ConcurrentHashMap<>();
 
     protected AtomicInteger conns = new AtomicInteger();
 

diff --git a/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java b/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
@@ -30,6 +30,7 @@
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.core.write.WriteRequestQueue;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.red5.server.api.Red5;
 import org.red5.server.net.IConnectionManager;
 import org.red5.server.net.rtmp.codec.RTMP;
 import org.red5.server.net.rtmp.message.Packet;
@@ -131,7 +132,9 @@ public void messageReceived(IoSession session, Object message) throws Exception
                     byte state = conn.getStateCode();
                     // checking the state before allowing a task to be created will hopefully prevent rejected task exceptions
                     if (state != RTMP.STATE_DISCONNECTING && state != RTMP.STATE_DISCONNECTED) {
+                        Red5.setConnectionLocal(conn);
                         conn.handleMessageReceived((Packet) message);
+                        Red5.setConnectionLocal(null);
                     } else {
                         log.info("Ignoring received message on {} due to state: {}", sessionId, RTMP.states[state]);
                     }

diff --git a/src/main/server/conf/red5-core.xml b/src/main/server/conf/red5-core.xml
@@ -27,6 +27,7 @@
         <property name="threadNamePrefix" value="RTMPConnectionScheduler-" />
     </bean>
 
+<!--
     <bean id="messageExecutor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
         <property name="corePoolSize" value="${rtmp.executor.core_pool_size}" />
         <property name="maxPoolSize" value="${rtmp.executor.max_pool_size}" />
@@ -42,6 +43,7 @@
         <property name="waitForTasksToCompleteOnShutdown" value="true" />
         <property name="threadNamePrefix" value="DeadlockGuardScheduler-" />
     </bean>
+-->
 
     <!-- RTMP connection manager -->
     <bean id="rtmpConnManager" class="org.red5.server.net.rtmp.RTMPConnManager" />
@@ -103,10 +105,10 @@
     <bean id="rtmpMinaConnection" scope="prototype" class="org.red5.server.net.rtmp.RTMPMinaConnection">
         <!-- Executor for scheduled tasks -->
         <property name="scheduler" ref="rtmpScheduler" />
-        <!-- Executor for incoming messages -->
+<!-- 
         <property name="executor" ref="messageExecutor" />
-        <!-- Deadlock guard executor -->
         <property name="deadlockGuardScheduler" ref="deadlockGuardScheduler" />
+-->
         <!-- Ping clients every X ms. Set to 0 to disable ghost detection code. -->
         <property name="pingInterval" value="${rtmp.ping_interval}" />
         <!-- Disconnect client after X ms of not responding. -->
@@ -158,10 +160,10 @@
     <bean id="rtmptConnection" scope="prototype" class="org.red5.server.net.rtmpt.RTMPTConnection">
         <!-- Executor for scheduled tasks -->
         <property name="scheduler" ref="rtmpScheduler" />
-        <!-- Executor for incoming messages -->
+<!--
         <property name="executor" ref="messageExecutor" />
-        <!-- Deadlock guard executor -->
         <property name="deadlockGuardScheduler" ref="deadlockGuardScheduler" />
+-->
         <!-- Ping clients every X ms. Set to 0 to disable ghost detection code. -->
         <property name="pingInterval" value="${rtmpt.ping_interval}" />
         <!-- Disconnect client after X ms of not responding. -->