Updates for 1.0.9-M7

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

Hide file tree

Showing 2 changed files with 4 additions and 2 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-M6</version>
+        <version>1.0.9-M7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

diff --git a/src/main/java/org/red5/server/adapter/MultiThreadedApplicationAdapter.java b/src/main/java/org/red5/server/adapter/MultiThreadedApplicationAdapter.java
@@ -1203,7 +1203,9 @@ public void streamBroadcastClose(IBroadcastStream stream) {
         // log w3c connect event
         IConnection conn = Red5.getConnectionLocal();
         // converted to seconds
-        long publishDuration = (System.currentTimeMillis() - stream.getCreationTime()) / 1000;
+        long now = System.currentTimeMillis();
+        long startTime = stream.getStartTime() > 0 ? stream.getStartTime() : now;
+        long publishDuration = Math.max((now - startTime) / 1000, 0L);
         if (conn != null) {
             log.info("W3C x-category:stream x-event:unpublish c-ip:{} cs-bytes:{} sc-bytes:{} x-sname:{} x-file-length:{} x-name:{}", new Object[] { conn.getRemoteAddress(), conn.getReadBytes(), conn.getWrittenBytes(), stream.getName(), publishDuration, stream.getPublishedName() });
         } else {