Repository: openmeetings Updated Branches: refs/heads/master d4cc7b38c -> 36abb3327
no jira: atomic move is removed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/36abb332 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/36abb332 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/36abb332 Branch: refs/heads/master Commit: 36abb33279c9778884b3ce5b068b883f01045c68 Parents: d4cc7b3 Author: Maxim Solodovnik <[email protected]> Authored: Mon Jul 31 14:07:34 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Jul 31 14:09:23 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/core/converter/FlvExplorerConverter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/36abb332/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java index 96763c3..98d0f9c 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.core.converter; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; @@ -25,7 +26,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.List; @@ -49,8 +49,8 @@ public class FlvExplorerConverter extends BaseConverter { Path tmp = null; if (sameExt) { //we should do in-place conversion - tmp = Files.createTempFile("video", "mp4"); - input = Files.move(mp4.toPath(), tmp, StandardCopyOption.ATOMIC_MOVE).toFile().getCanonicalPath(); + tmp = Files.createTempFile("video", ".mp4"); + input = Files.move(mp4.toPath(), tmp, REPLACE_EXISTING).toFile().getCanonicalPath(); } String[] args = new String[] { getPathToFFMPEG(), "-y" , "-i", input // @@ -66,7 +66,7 @@ public class FlvExplorerConverter extends BaseConverter { Files.delete(tmp); } else { //conversion fails, need to move temp file back - Files.move(tmp, mp4.toPath(), StandardCopyOption.ATOMIC_MOVE); + Files.move(tmp, mp4.toPath(), REPLACE_EXISTING); } } //Parse the width height from the FFMPEG output
