You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/04/01 16:28:14 UTC
[2/5] brooklyn-server git commit: Task serializer: avoid NPE if task
result is null
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/b39c7a03
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b39c7a03
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b39c7a03
Branch: refs/heads/0.9.0
Commit: b39c7a03c3caad1ef35c1b6b9f61bb566bf14446
Parents: 426ced9
Author: Aled Sage <al...@gmail.com>
Authored: Thu Mar 31 20:51:26 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Apr 1 15:27:37 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/b39c7a03/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) {