diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-02-29 08:16:34 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-02-29 08:16:34 -0500 |
| commit | a5959af7acc59bca473a82f453f7efe60ee0dd34 (patch) | |
| tree | 1778fd132a3bced7d83d40fe0a6331e5ab51850b /models-interactions | |
| parent | da47a120294d931bde38d821df8979813564e05c (diff) | |
Sequence throws NPE if task outcome is null
If a task outcome is null, then sequence() throws an NPE. Modified
it to treat a null outcome as a failure.
Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I57b8be27f72c7cbf43e0b3b8816696ab1928f396
Diffstat (limited to 'models-interactions')
2 files changed, 4 insertions, 2 deletions
diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java index 24c7ec866..04360447c 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java @@ -166,7 +166,7 @@ public abstract class OperationPartial implements Operation { return outcome -> { - if (outcome != null && isSuccess(outcome)) { + if (isSuccess(outcome)) { logger.info("{}: preprocessor succeeded for {}", getFullName(), params.getRequestId()); return CompletableFuture.completedFuture(outcome); } @@ -344,7 +344,7 @@ public abstract class OperationPartial implements Operation { * @return {@code true} if the outcome was successful */ protected boolean isSuccess(OperationOutcome outcome) { - return (outcome.getResult() == PolicyResult.SUCCESS); + return (outcome != null && outcome.getResult() == PolicyResult.SUCCESS); } /** diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java index 229e5a32a..b73a3a068 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java @@ -360,6 +360,8 @@ public class OperationPartialTest { @Test public void testIsSuccess() { + assertFalse(oper.isSuccess(null)); + OperationOutcome outcome = new OperationOutcome(); outcome.setResult(PolicyResult.SUCCESS); |