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 2017/07/31 07:07:42 UTC
openmeetings git commit: no jira: atomic move is removed
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 49ca5ed0c -> 57c7bdfef
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/57c7bdfe
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/57c7bdfe
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/57c7bdfe
Branch: refs/heads/3.3.x
Commit: 57c7bdfef15dccc3c1d7c0b70e03409a8f04459b
Parents: 49ca5ed
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Jul 31 14:07:34 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Jul 31 14:07:34 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/57c7bdfe/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 84727af..60ae550 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;
@@ -55,8 +55,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 //
@@ -72,7 +72,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