Author: solomax
Date: Mon Aug 20 03:14:47 2012
New Revision: 1374903
URL: http://svn.apache.org/viewvc?rev=1374903&view=rev
Log:
OPENMEETINGS-402 String concatenations of File names is replaces with
File(parent, child)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java?rev=1374903&r1=1374902&r2=1374903&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Mon Aug 20 03:14:47 2012
@@ -441,8 +441,7 @@ public class FlvInterviewConverter exten
String hashFileFullNameFlv = "flvRecording_"
+ flvRecording.getFlvRecordingId() +
".flv";
- String outputFullFlv = streamFolderGeneral
- + hashFileFullNameFlv;
+ String outputFullFlv = new File(streamFolderGeneral,
hashFileFullNameFlv).getCanonicalPath();
deleteFileIfExists(outputFullFlv);
// ffmpeg -vcodec flv -qscale 9.5 -r 25 -ar 22050 -ab
32k -s 320x240
@@ -491,7 +490,7 @@ public class FlvInterviewConverter exten
String hashFileFullNameJPEG = "flvRecording_"
+ flvRecording.getFlvRecordingId() +
".jpg";
- String outPutJpeg = streamFolderGeneral +
hashFileFullNameJPEG;
+ String outPutJpeg = new File(streamFolderGeneral,
hashFileFullNameJPEG).getCanonicalPath();
deleteFileIfExists(outPutJpeg);
flvRecording.setPreviewImage(hashFileFullNameJPEG);
@@ -519,8 +518,7 @@ public class FlvInterviewConverter exten
String alternateDownloadName = "flvRecording_"
+ flvRecording.getFlvRecordingId() +
".avi";
- String alternateDownloadFullName = streamFolderGeneral
- + alternateDownloadName;
+ String alternateDownloadFullName = new
File(streamFolderGeneral, alternateDownloadName).getCanonicalPath();
deleteFileIfExists(alternateDownloadFullName);
String[] argv_alternateDownload = new String[] {