Refactoring playback

Red5 · Jul 6, 2016 · 640499d · 640499d
1 parent f929d33
commit 640499d
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 198 deletions.
diff --git a/pom.xml b/pom.xml
@@ -155,6 +155,10 @@
                         <artifactId>spring-web</artifactId>
                         <groupId>org.springframework</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>spring-test</artifactId>
+                        <groupId>org.springframework</groupId>
+                    </exclusion>
                     <exclusion>
                         <artifactId>quartz</artifactId>
                         <groupId>org.quartz-scheduler</groupId>
@@ -177,6 +181,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/src/main/java/org/red5/server/stream/AbstractStream.java b/src/main/java/org/red5/server/stream/AbstractStream.java
@@ -29,7 +29,7 @@
 import org.red5.server.net.rtmp.event.Notify;
 
 /**
- * Abstract base implementation of IStream. Contains codec information, stream name, scope, event handling meand, provides stream start and stop operations.
+ * Abstract base implementation of IStream. Contains codec information, stream name, scope, event handling, and provides stream start and stop operations.
  *
  * @see org.red5.server.api.stream.IStream
  */

diff --git a/src/main/java/org/red5/server/stream/ClientBroadcastStream.java b/src/main/java/org/red5/server/stream/ClientBroadcastStream.java
@@ -596,8 +596,7 @@ public void onPipeConnectionEvent(PipeConnectionEvent event) {
                 subscriberStats.increment();
                 break;
             case PipeConnectionEvent.CONSUMER_DISCONNECT:
-                log.debug("Consumer disconnect");
-                log.debug("Consumer: {}", event.getSource().getClass().getName());
+                log.debug("Consumer disconnect: {}", event.getSource().getClass().getName());
                 subscriberStats.decrement();
                 break;
             default: