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 2019/12/05 11:51:43 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2146] typos are
fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 99c2d9c [OPENMEETINGS-2146] typos are fixed
99c2d9c is described below
commit 99c2d9c28edc7be515c3f9d72ac8a7e4d1c91c2c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Dec 5 18:51:30 2019 +0700
[OPENMEETINGS-2146] typos are fixed
---
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index adaaa7d..3883f85 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -908,12 +908,11 @@ public class BackupImport {
String oldHash = r.getHash();
if (!Strings.isEmpty(oldHash) && oldHash.startsWith(RECORDING_FILE_NAME)) {
String name = getFileName(oldHash);
+ r.setHash(randomUUID().toString());
fileMap.put(String.format(FILE_NAME_FMT, name, EXTENSION_JPG), String.format(FILE_NAME_FMT, r.getHash(), EXTENSION_PNG));
fileMap.put(String.format("%s.%s.%s", name, "flv", EXTENSION_MP4), String.format(FILE_NAME_FMT, r.getHash(), EXTENSION_MP4));
- r.setHash(randomUUID().toString());
- } else {
- checkHash(r, recordingDao);
}
+ checkHash(r, recordingDao);
r = recordingDao.update(r);
if (BaseFileItem.Type.Folder == r.getType()) {
folders.put(recId, r.getId());
@@ -1024,7 +1023,7 @@ public class BackupImport {
Long fId = file.getId();
// We need to reset this as openJPA reject to store them otherwise
file.setId(null);
- checkHash(file, recordingDao);
+ checkHash(file, fileItemDao);
file = fileItemDao.update(file);
if (BaseFileItem.Type.Folder == file.getType()) {
folders.put(fId, file.getId());