1 files changed, 4 insertions, 1 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index 7811b2d73..b82a5f8e5 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -666,7 +666,10 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
      */
     public int getControlLoopTimeout(Integer defaultTimeout) {
         if (this.processor != null && this.processor.getControlLoop() != null) {
-            return this.processor.getControlLoop().getTimeout();
+            Integer timeout = this.processor.getControlLoop().getTimeout();
+            if (timeout != null && timeout > 0) {
+                return timeout;
+            }
         }
         if (defaultTimeout != null) {
             return defaultTimeout;