From 334ddc139c8c8aa3a8ced93c6057a65ba51c8321 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Mon, 9 Mar 2020 10:22:29 -0400
Subject: Immediately finish if guard is disabled

Modified the Guard Actor to check the "disabled" flag during
start() instead of waiting until it gets down into startOperationAsync.

Issue-ID: POLICY-1625-guard-disabled
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Id6ccf506b82504552d6e1f4637ad11e2e41e77e5
---
 .../controlloop/actorserviceprovider/impl/OperationPartial.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'models-interactions/model-actors/actorServiceProvider/src')

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 94a9ee560..cdbdc2af5 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
@@ -891,7 +891,7 @@ public abstract class OperationPartial implements Operation {
      * @param callbacks used to determine if the start callback can be invoked
      * @return a function that sets the start time and invokes the callback
      */
-    private BiConsumer<OperationOutcome, Throwable> callbackStarted(CallbackManager callbacks) {
+    protected BiConsumer<OperationOutcome, Throwable> callbackStarted(CallbackManager callbacks) {
 
         return (outcome, thrown) -> {
 
@@ -920,7 +920,7 @@ public abstract class OperationPartial implements Operation {
      * @param callbacks used to determine if the end callback can be invoked
      * @return a function that sets the end time and invokes the callback
      */
-    private BiConsumer<OperationOutcome, Throwable> callbackCompleted(CallbackManager callbacks) {
+    protected BiConsumer<OperationOutcome, Throwable> callbackCompleted(CallbackManager callbacks) {
 
         return (outcome, thrown) -> {
             if (callbacks.canEnd()) {
-- 
cgit 1.2.3-korg