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/24 12:33:14 UTC
openmeetings git commit: [OPENMEETINGS-1672] backup should be fixed
Repository: openmeetings
Updated Branches:
refs/heads/master fd5882e64 -> 9504ae3f4
[OPENMEETINGS-1672] backup should be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9504ae3f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9504ae3f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9504ae3f
Branch: refs/heads/master
Commit: 9504ae3f4fa331afd8219b47717b8315a4c36254
Parents: fd5882e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Jul 24 19:33:04 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Jul 24 19:33:04 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/backup/BackupExport.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9504ae3f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index a18586b..267d178 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -133,11 +133,10 @@ public class BackupExport {
private RoomGroupDao roomGroupDao;
public void performExport(File zip, boolean includeFiles, ProgressHolder progressHolder) throws Exception {
- if (!zip.getParentFile().exists()) {
+ if (zip.getParentFile() != null && !zip.getParentFile().exists()) {
zip.getParentFile().mkdirs();
}
try (FileOutputStream fos = new FileOutputStream(zip); ZipOutputStream zos = new ZipOutputStream(fos)) {
-
Serializer ser = new Persister();
progressHolder.setProgress(0);