You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/20 18:03:13 UTC
[1/2] brooklyn-server git commit: Fix NPE in forcePersistNow
Repository: brooklyn-server
Updated Branches:
refs/heads/master 3ad955999 -> d3cc05026
Fix NPE in forcePersistNow
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8163d02b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8163d02b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8163d02b
Branch: refs/heads/master
Commit: 8163d02b02c48a3449891480c8f203fef606bb83
Parents: 9fb4193
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Wed Apr 20 10:00:50 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Wed Apr 20 11:31:37 2016 +0100
----------------------------------------------------------------------
.../brooklyn/core/mgmt/rebind/RebindManagerImpl.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8163d02b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
index 5525981..48365d4 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
@@ -435,17 +435,23 @@ public class RebindManagerImpl implements RebindManager {
persistenceRealChangeListener.waitForPendingComplete(timeout, canTrigger);
persistenceStoreAccess.waitForWritesCompleted(timeout);
}
+
@Override
@VisibleForTesting
public void forcePersistNow() {
forcePersistNow(false, null);
}
+
@Override
@VisibleForTesting
public void forcePersistNow(boolean full, PersistenceExceptionHandler exceptionHandler) {
+ if (persistenceStoreAccess == null || persistenceRealChangeListener == null) {
+ LOG.info("Skipping forced persist; no persistence mechanism available");
+ return;
+ }
if (full) {
BrooklynMementoRawData memento = BrooklynPersistenceUtils.newStateMemento(managementContext, MementoCopyMode.LOCAL);
- if (exceptionHandler==null) {
+ if (exceptionHandler == null) {
exceptionHandler = persistenceRealChangeListener.getExceptionHandler();
}
persistenceStoreAccess.checkpoint(memento, exceptionHandler);
@@ -455,7 +461,7 @@ public class RebindManagerImpl implements RebindManager {
}
}
}
-
+
@Override
public ChangeListener getChangeListener() {
return persistencePublicChangeListener;
[2/2] brooklyn-server git commit: Closes #113
Posted by sv...@apache.org.
Closes #113
Fix NPE in forcePersistNow
Fixes issue where `forcePeristNow()` fails due to `persistenceRealChangeListener` being null
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d3cc0502
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d3cc0502
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d3cc0502
Branch: refs/heads/master
Commit: d3cc0502611c225732d15898c4db753e7de2d719
Parents: 3ad9559 8163d02
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Apr 20 17:03:02 2016 +0100
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Apr 20 17:03:02 2016 +0100
----------------------------------------------------------------------
.../brooklyn/core/mgmt/rebind/RebindManagerImpl.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------