From 8a4c15d50a7b9b5f0ea8d59d66ca69606e17032d Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Thu, 30 Nov 2017 10:12:33 -0600 Subject: make volatile access to alive and locked flags instead of synchronized read access Change-Id: I3f4457f798d6f4d4a013bf023ed2d9c1b75d4f1f Issue-ID: POLICY-487 Signed-off-by: Jorge Hernandez (cherry picked from commit cbe3fbc728f0428dc339f0b43c2afed163e9ffa7) --- .../onap/policy/drools/event/comm/bus/internal/BusPublisher.java | 6 +----- .../src/main/java/org/onap/policy/drools/system/PolicyEngine.java | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java index 10bc8325..ad5a9179 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java +++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java @@ -139,10 +139,7 @@ public interface BusPublisher { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("CambriaPublisherWrapper ["). - append("publisher.getPendingMessageCount()="). - append(publisher.getPendingMessageCount()). - append("]"); + builder.append("CambriaPublisherWrapper []"); return builder.toString(); } @@ -289,7 +286,6 @@ public interface BusPublisher { append(", publisher.getHost()=").append(publisher.getHost()). append(", publisher.getProtocolFlag()=").append(publisher.getProtocolFlag()). append(", publisher.getUsername()=").append(publisher.getUsername()). - append(", publisher.getPendingMessageCount()=").append(publisher.getPendingMessageCount()). append("]"); return builder.toString(); } diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java index d60e817a..583deacc 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java @@ -357,12 +357,12 @@ class PolicyEngineManager implements PolicyEngine { /** * Is the Policy Engine running? */ - protected boolean alive = false; + protected volatile boolean alive = false; /** * Is the engine locked? */ - protected boolean locked = false; + protected volatile boolean locked = false; /** * Properties used to initialize the engine @@ -1018,7 +1018,7 @@ class PolicyEngineManager implements PolicyEngine { } @Override - public synchronized boolean isAlive() { + public boolean isAlive() { return this.alive; } @@ -1117,7 +1117,7 @@ class PolicyEngineManager implements PolicyEngine { } @Override - public synchronized boolean isLocked() { + public boolean isLocked() { return this.locked; } -- cgit 1.2.3-korg