Merge "make volatile access to alive and locked flags"

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;
   }