diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2020-03-01 14:38:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-01 14:38:22 +0000 |
| commit | fe0673988d5707bbb6553802946f3ca5b31dca44 (patch) | |
| tree | 38a5da6a8535831d49e78e2880e608f2d810ceff /models-interactions/model-actors/actorServiceProvider | |
| parent | 394929613dd177b9715553faa3aa4d35eacf57d1 (diff) | |
| parent | a5959af7acc59bca473a82f453f7efe60ee0dd34 (diff) | |
Merge "Sequence throws NPE if task outcome is null"
Diffstat (limited to 'models-interactions/model-actors/actorServiceProvider')
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); |