You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/04/01 13:20:16 UTC
[1/3] brooklyn-server git commit: Localhost machine: don’t persist mutexSupport
Repository: brooklyn-server
Updated Branches:
refs/heads/master 36a29180d -> 797ed8f26
Localhost machine: don’t persist mutexSupport
By passing mutexSupport in the machine’s config, it is persisted. But
this tries to pull in persisting threads etc!
It is not necessary to pass it: the Localhost machine overrides the
getMutexSupport().
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f0b1bf8c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f0b1bf8c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f0b1bf8c
Branch: refs/heads/master
Commit: f0b1bf8cb832f4c000f3c9a7c43327ec5aabd82f
Parents: cf305e2
Author: Aled Sage <al...@gmail.com>
Authored: Thu Mar 31 20:50:59 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Mar 31 20:50:59 2016 +0100
----------------------------------------------------------------------
.../location/localhost/LocalhostMachineProvisioningLocation.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f0b1bf8c/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
index ab7ad01..fbdb769 100644
--- a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
@@ -176,7 +176,6 @@ public class LocalhostMachineProvisioningLocation extends FixedListMachineProvis
Map<Object,Object> flags2 = MutableMap.<Object,Object>builder()
.putAll(flags)
.put("address", elvis(address, Networking.getLocalHost()))
- .put("mutexSupport", LocalhostMachine.mutexSupport)
.build();
// copy inherited keys for ssh;
[3/3] brooklyn-server git commit: This closes #97
Posted by al...@apache.org.
This closes #97
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/797ed8f2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/797ed8f2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/797ed8f2
Branch: refs/heads/master
Commit: 797ed8f2635390a4d5074a14a2bbc5c08bc547c8
Parents: 36a2918 2dadb24
Author: Aled Sage <al...@gmail.com>
Authored: Fri Apr 1 12:20:05 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Apr 1 12:20:05 2016 +0100
----------------------------------------------------------------------
.../apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java | 5 ++++-
.../localhost/LocalhostMachineProvisioningLocation.java | 1 -
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-server git commit: Task serializer: avoid NPE if task
result is null
Posted by al...@apache.org.
Task serializer: avoid NPE if task result is 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/2dadb24b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2dadb24b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2dadb24b
Branch: refs/heads/master
Commit: 2dadb24b9b8e458d4dc1ebe4429d070913036679
Parents: f0b1bf8
Author: Aled Sage <al...@gmail.com>
Authored: Thu Mar 31 20:51:26 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Mar 31 20:51:26 2016 +0100
----------------------------------------------------------------------
.../apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2dadb24b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
index 00693d9..e9085dc 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
@@ -315,7 +315,10 @@ public class XmlMementoSerializer<T> extends XmlSerializer<T> implements Memento
if (source == null) return;
if (((Task<?>)source).isDone() && !((Task<?>)source).isError()) {
try {
- context.convertAnother(((Task<?>)source).get());
+ Object nextItem = ((Task<?>)source).get();
+ if (nextItem != null) {
+ context.convertAnother(nextItem);
+ }
} catch (InterruptedException e) {
throw Exceptions.propagate(e);
} catch (ExecutionException e) {