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 2017/10/03 14:24:05 UTC
[28/35] brooklyn-server git commit: fix null ref in task submitted-by
field
fix null ref in task submitted-by field
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/447283bd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/447283bd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/447283bd
Branch: refs/heads/master
Commit: 447283bdab4b8a2be5c7ff67d07b346d00f8d4c2
Parents: afc17ee
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Oct 2 15:56:54 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Oct 2 15:56:54 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/util/core/task/BasicTask.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/447283bd/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java
index 4f448ec..4913ab3 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java
@@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -910,11 +911,11 @@ public class BasicTask<T> implements TaskInternal<T> {
@Override
public void setSubmittedByTask(Task<?> task) {
- setSubmittedByTask(Maybe.of(task), task==null ? null : task.getId());
+ setSubmittedByTask(Maybe.ofDisallowingNull(task), task==null ? null : task.getId());
}
@Override
public void setSubmittedByTask(Maybe<Task<?>> taskM, String taskId) {
- submittedByTask = taskM;
+ submittedByTask = Preconditions.checkNotNull(taskM);
submittedByTaskId = taskId;
}