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 2018/01/26 03:53:13 UTC
[05/13] openmeetings git commit: [OPENMEETINGS-1773] saved WB import
is fixed
[OPENMEETINGS-1773] saved WB import is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d0512ba2
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d0512ba2
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d0512ba2
Branch: refs/heads/wicket-defer-all
Commit: d0512ba2eced6132da43ea79390299b1db3f21dc
Parents: 9922eec
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jan 11 22:14:20 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jan 11 22:14:20 2018 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/backup/BackupImport.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d0512ba2/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
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 8e2c015..83f05d0 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
@@ -424,6 +424,9 @@ public class BackupImport {
if (ver.compareTo(BackupVersion.get("4.0.0")) < 0) {
for (BaseFileItem bfi : files) {
+ if (bfi.isDeleted()) {
+ continue;
+ }
if (BaseFileItem.Type.Presentation == bfi.getType()) {
convertOldPresentation((FileItem)bfi);
}
@@ -487,7 +490,7 @@ public class BackupImport {
if (CONFIG_CRYPT.equals(c.getKey())) {
try {
Class<?> clazz = Class.forName(c.getValue());
- clazz.newInstance();
+ clazz.getDeclaredConstructor().newInstance();
} catch (Exception e) {
log.warn("Not existing Crypt class found {}, replacing with SCryptImplementation", c.getValue());
c.setValue(SCryptImplementation.class.getCanonicalName());