summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-09-12 19:54:09 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-12 19:54:09 +0000
commit3ccc3d9ecd4bcd8960a2da6ecbdc7f3ac806fc67 (patch)
tree80e469a5b7ab7ed32e4b276c79ecf1c4a945955a /core
parent26ad7026f09a43bc60ee18c4b74e977f9f59db9f (diff)
parentcce09d08ead0c7cf152b2e63374a18e04b280b61 (diff)
Merge "Fix soft stop and start of engine"
Diffstat (limited to 'core')
-rw-r--r--core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java
index 3349b609f..3497ed660 100644
--- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java
+++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java
@@ -247,8 +247,11 @@ public class ApexEngineImpl implements ApexEngine {
// Clear everything
stateMachineHandler = null;
engineStats.clean();
- internalContext.clear();
- internalContext = null;
+
+ if (internalContext != null) {
+ internalContext.clear();
+ internalContext = null;
+ }
}
/*