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 2014/08/05 20:27:37 UTC

svn commit: r1615974 - /openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java

Author: solomax
Date: Tue Aug  5 18:27:36 2014
New Revision: 1615974

URL: http://svn.apache.org/r1615974
Log:
[OPENMEETINGS-984] autorepairing is added

Modified:
    openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java

Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1615974&r1=1615973&r2=1615974&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java Tue Aug  5 18:27:36 2014
@@ -42,6 +42,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta;
 import org.apache.openmeetings.util.process.ConverterProcessResult;
 import org.apache.openmeetings.util.process.ProcessHelper;
+import org.red5.io.flv.impl.FLVWriter;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -193,7 +194,6 @@ public abstract class BaseConverter {
 					if (maxTimestamp + TIME_TO_WAIT_FOR_FRAME < System.currentTimeMillis()) {
 						if (metaSer.exists()) {
 							log.debug("### long time without any update, trying to repair ... ");
-							/*
 							try {
 								if (FLVWriter.repair(metaSer.getCanonicalPath(), null, null) && !metaSer.exists()) {
 									metaData.setStreamStatus(Status.STOPPED);
@@ -202,7 +202,6 @@ public abstract class BaseConverter {
 							} catch (IOException e) {
 								log.error("### Error while file repairing ... ", e);
 							}
-							*/
 						} else {
 							log.debug("### long time without any update, closing ... ");
 							metaData.setStreamStatus(Status.STOPPED);