You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/04/24 06:05:49 UTC
svn commit: r1329543 -
/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
Author: solomax
Date: Tue Apr 24 04:05:49 2012
New Revision: 1329543
URL: http://svn.apache.org/viewvc?rev=1329543&view=rev
Log:
OPENMEETINGS-211 NPE is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1329543&r1=1329542&r2=1329543&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java Tue Apr 24 04:05:49 2012
@@ -213,9 +213,12 @@ public class StreamAudioWriter extends B
@Override
public void closeStream() {
try {
-
writer.close();
+ } catch (Exception err) {
+ log.error("[closeStream, close writer]", err);
+ }
+ try {
// We do not add any End Padding or count the gaps for the
// Screen Data, cause there is no!
@@ -223,14 +226,13 @@ public class StreamAudioWriter extends B
log.debug("virtualTime: " + virtualTime);
log.debug("startedSessionTimeDate: " + startedSessionTimeDate);
- long deltaRecordingTime = virtualTime.getTime() - this.startedSessionTimeDate.getTime();
+ long deltaRecordingTime = virtualTime == null ? 0 : virtualTime.getTime() - startedSessionTimeDate.getTime();
- log.debug("lastTimeStamp :closeStream: " + this.lastTimeStamp);
- log.debug("lastStreamPacketTimeStamp :closeStream: " + this.lastStreamPacketTimeStamp);
+ log.debug("lastTimeStamp :closeStream: " + lastTimeStamp);
+ log.debug("lastStreamPacketTimeStamp :closeStream: " + lastStreamPacketTimeStamp);
log.debug("deltaRecordingTime :closeStream: " + deltaRecordingTime);
- long deltaTimePaddingEnd = deltaRecordingTime
- - this.lastTimeStamp - this.initialDelta;
+ long deltaTimePaddingEnd = deltaRecordingTime - lastTimeStamp - initialDelta;
log.debug("deltaTimePaddingEnd :: " + deltaTimePaddingEnd);
@@ -238,15 +240,15 @@ public class StreamAudioWriter extends B
flvRecordingMetaDelta.setDeltaTime(deltaTimePaddingEnd);
flvRecordingMetaDelta
- .setFlvRecordingMetaDataId(this.flvRecordingMetaDataId);
- flvRecordingMetaDelta.setTimeStamp(this.lastTimeStamp);
+ .setFlvRecordingMetaDataId(flvRecordingMetaDataId);
+ flvRecordingMetaDelta.setTimeStamp(lastTimeStamp);
flvRecordingMetaDelta.setDebugStatus("END AUDIO");
flvRecordingMetaDelta.setIsStartPadding(false);
flvRecordingMetaDelta.setIsEndPadding(true);
flvRecordingMetaDelta.setDataLengthPacket(null);
flvRecordingMetaDelta
- .setReceivedAudioDataLength(this.byteCount);
- flvRecordingMetaDelta.setStartTime(this.startedSessionTimeDate);
+ .setReceivedAudioDataLength(byteCount);
+ flvRecordingMetaDelta.setStartTime(startedSessionTimeDate);
flvRecordingMetaDelta.setCurrentTime(new Date());
flvRecordingMetaDeltaDao