You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nr...@apache.org on 2018/03/01 17:32:38 UTC
[geode] branch develop updated: GEODE-4757: Prevent NPE when
non-incremental backup conducted (#1530)
This is an automated email from the ASF dual-hosted git repository.
nreich pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 7b5fe8f GEODE-4757: Prevent NPE when non-incremental backup conducted (#1530)
7b5fe8f is described below
commit 7b5fe8f895ed4b7a6320146ca9d85fb142634cb0
Author: Nick Reich <nr...@pivotal.io>
AuthorDate: Thu Mar 1 09:32:35 2018 -0800
GEODE-4757: Prevent NPE when non-incremental backup conducted (#1530)
---
.../org/apache/geode/admin/internal/AdminDistributedSystemImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index 72719a9..509d6ae 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -2363,7 +2363,8 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
public static BackupStatus backupAllMembers(DistributionManager dm, File targetDir,
File baselineDir) throws AdminException {
- return BackupUtil.backupAllMembers(dm, targetDir.toString(), baselineDir.toString());
+ String baselineDirectory = baselineDir == null ? null : baselineDir.toString();
+ return BackupUtil.backupAllMembers(dm, targetDir.toString(), baselineDirectory);
}
public Map<DistributedMember, Set<PersistentID>> compactAllDiskStores() throws AdminException {
--
To stop receiving notification emails like this one, please contact
nreich@apache.org.