Fixing Sonar bugs and Vulnerabilities

Change-Id: I69c65d808133ac75d9f93aa0d63326ca8c67f839
Issue-ID: POLICY-856
Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>

7 files changed, 125 insertions, 134 deletions

diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextInstantiation.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextInstantiation.java
index 4a9af5a4c..4b47c63db 100644
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextInstantiation.java
+++ b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextInstantiation.java
@@ -82,8 +82,8 @@ public class ContextInstantiation {
         Distributor contextDistributor = null;
         try {
             contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-        } catch (final Exception e) {
-            e.printStackTrace();
+        } catch (final Exception exception) {
+            LOGGER.error("Error occured while Instantiating Distributor for : {}", distributorKey, exception);
             return;
         }
 
@@ -158,8 +158,8 @@ public class ContextInstantiation {
                 policyContextAlbum.put("TestPolicyContextItem000", testPolicyContextItem000);
                 assert ("Test should throw an exception".equals(""));
             } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals(
-                        "Failed to set context value for key \"TestPolicyContextItem000\" in album \"PolicyContextAlbum:0.0.1\": "
+                assert (e.getMessage()
+                        .equals("Failed to set context value for key \"TestPolicyContextItem000\" in album \"PolicyContextAlbum:0.0.1\": "
                                 + "PolicyContextAlbum:0.0.1: object \"TestContextItem006 [stringValue=This is a policy context string]\" "
                                 + "of class \"org.onap.policy.apex.context.test.concepts.TestContextItem006\""
                                 + " not compatible with class \"org.onap.policy.apex.context.test.concepts.TestPolicyContextItem\""));
@@ -169,8 +169,8 @@ public class ContextInstantiation {
                 policyContextAlbum.putAll(valueMapA);
                 assert ("Test should throw an exception".equals(""));
             } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals(
-                        "Failed to set context value for key \"TestPolicyContextItem001\" in album \"PolicyContextAlbum:0.0.1\": "
+                assert (e.getMessage()
+                        .equals("Failed to set context value for key \"TestPolicyContextItem001\" in album \"PolicyContextAlbum:0.0.1\": "
                                 + "PolicyContextAlbum:0.0.1: object \"TestContextItem003 [longValue=-1]\" "
                                 + "of class \"org.onap.policy.apex.context.test.concepts.TestContextItem003\""
                                 + " not compatible with class \"org.onap.policy.apex.context.test.concepts.TestPolicyContextItem\""));
@@ -192,18 +192,15 @@ public class ContextInstantiation {
 
             policyContextAlbum.putAll(valueMap0);
 
-            assert (((TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem"))
-                    .getTestPolicyContextItem000().getStringValue().equals("This is a policy context string"));
-            assert (((TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem"))
-                    .getTestPolicyContextItem001().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
-            assert (((TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem"))
-                    .getTestPolicyContextItem002().getDoubleValue() == Math.PI);
-            assert (((TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem"))
-                    .getTestPolicyContextItem003().getFlag());
-            assert (((TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem"))
-                    .getTestPolicyContextItem004().getLongValue() == testDate.getTime());
-            assert (((TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem"))
-                    .getTestPolicyContextItem005().getMapValue().equals(testHashMap));
+            final TestPolicyContextItem contextItem =
+                    (TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem");
+            assert (contextItem.getTestPolicyContextItem000().getStringValue()
+                    .equals("This is a policy context string"));
+            assert (contextItem.getTestPolicyContextItem001().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
+            assert (Double.compare(contextItem.getTestPolicyContextItem002().getDoubleValue(), Math.PI) == 0);
+            assert (contextItem.getTestPolicyContextItem003().getFlag());
+            assert (contextItem.getTestPolicyContextItem004().getLongValue() == testDate.getTime());
+            assert (contextItem.getTestPolicyContextItem005().getMapValue().equals(testHashMap));
 
             final AxContextModel globalContextModel = TestContextAlbumFactory.createGlobalContextModel();
 
@@ -254,32 +251,24 @@ public class ContextInstantiation {
 
             globalContextAlbum.putAll(valueMap1);
 
-            assert (!((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem000()
-                    .getFlag());
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem001()
-                    .getByteValue() == (byte) 0xFF);
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem002()
-                    .getIntValue() == 0xFFFFFFFF);
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem003()
-                    .getLongValue() == 0xFFFFFFFFFFFFFFFFL);
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem004()
-                    .getFloatValue() == testFloat);
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem005()
-                    .getDoubleValue() == Math.PI);
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem006()
-                    .getStringValue().equals("This is a global context string"));
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem007()
-                    .getLongValue() == testDate.getTime());
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem008()
-                    .getDateValue().equals(testDate));
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem009()
-                    .getDateValue().getTime() == tci9.getDateValue().getTime());
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem00A()
-                    .getDateValue().getTime() == tciA.getDateValue().getTime());
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem00B()
-                    .getSetValue().equals(testTreeSet));
-            assert (((TestGlobalContextItem) globalContextAlbum.get("globalContext")).getTestGlobalContextItem00C()
-                    .getMapValue().equals(testHashMap));
+            final TestGlobalContextItem globalContextItem =
+                    (TestGlobalContextItem) globalContextAlbum.get("globalContext");
+            assert (!globalContextItem.getTestGlobalContextItem000().getFlag());
+            assert (globalContextItem.getTestGlobalContextItem001().getByteValue() == (byte) 0xFF);
+            assert (globalContextItem.getTestGlobalContextItem002().getIntValue() == 0xFFFFFFFF);
+            assert (globalContextItem.getTestGlobalContextItem003().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
+            assert (Float.compare(globalContextItem.getTestGlobalContextItem004().getFloatValue(), testFloat) == 0);
+            assert (Double.compare(globalContextItem.getTestGlobalContextItem005().getDoubleValue(), Math.PI) == 0);
+            assert (globalContextItem.getTestGlobalContextItem006().getStringValue()
+                    .equals("This is a global context string"));
+            assert (globalContextItem.getTestGlobalContextItem007().getLongValue() == testDate.getTime());
+            assert (globalContextItem.getTestGlobalContextItem008().getDateValue().equals(testDate));
+            assert (globalContextItem.getTestGlobalContextItem009().getDateValue().getTime() == tci9.getDateValue()
+                    .getTime());
+            assert (globalContextItem.getTestGlobalContextItem00A().getDateValue().getTime() == tciA.getDateValue()
+                    .getTime());
+            assert (globalContextItem.getTestGlobalContextItem00B().getSetValue().equals(testTreeSet));
+            assert (globalContextItem.getTestGlobalContextItem00C().getMapValue().equals(testHashMap));
 
             final AxContextModel externalContextModel = TestContextAlbumFactory.createExternalContextModel();
 
@@ -330,32 +319,25 @@ public class ContextInstantiation {
             externalContextAlbum.putAll(valueMap2);
             externalContextAlbum.getAlbumDefinition().setWritable(false);
 
-            assert (!((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem000().getFlag());
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem001().getByteValue() == (byte) 0xFF);
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem002().getIntValue() == 0xFFFFFFFF);
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem003().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem004().getFloatValue() == testFloat);
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem005().getDoubleValue() == Math.PI);
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem006().getStringValue().equals("This is an external context string"));
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem007().getLongValue() == testDate.getTime());
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem008().getDateValue().equals(testDate));
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem009().getDateValue().getTime() == tci9A.getDateValue().getTime());
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem00A().getDateValue().getTime() == tciAA.getDateValue().getTime());
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem00B().getSetValue().equals(testTreeSet));
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem00C().getMapValue().equals(testHashMap));
+            final TestExternalContextItem externalContextItem =
+                    (TestExternalContextItem) externalContextAlbum.get("externalContext");
+
+            assert (!externalContextItem.getTestExternalContextItem000().getFlag());
+            assert (externalContextItem.getTestExternalContextItem001().getByteValue() == (byte) 0xFF);
+            assert (externalContextItem.getTestExternalContextItem002().getIntValue() == 0xFFFFFFFF);
+            assert (externalContextItem.getTestExternalContextItem003().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
+            assert (Float.compare(externalContextItem.getTestExternalContextItem004().getFloatValue(), testFloat) == 0);
+            assert (Double.compare(externalContextItem.getTestExternalContextItem005().getDoubleValue(), Math.PI) == 0);
+            assert (externalContextItem.getTestExternalContextItem006().getStringValue()
+                    .equals("This is an external context string"));
+            assert (externalContextItem.getTestExternalContextItem007().getLongValue() == testDate.getTime());
+            assert (externalContextItem.getTestExternalContextItem008().getDateValue().equals(testDate));
+            assert (externalContextItem.getTestExternalContextItem009().getDateValue().getTime() == tci9A.getDateValue()
+                    .getTime());
+            assert (externalContextItem.getTestExternalContextItem00A().getDateValue().getTime() == tciAA.getDateValue()
+                    .getTime());
+            assert (externalContextItem.getTestExternalContextItem00B().getSetValue().equals(testTreeSet));
+            assert (externalContextItem.getTestExternalContextItem00C().getMapValue().equals(testHashMap));
 
             final Collection<Object> mapValues = externalContextAlbum.values();
             assert (externalContextAlbum.values().containsAll(mapValues));
@@ -416,12 +398,10 @@ public class ContextInstantiation {
                 assert (e.getMessage().equals(
                         "album \"ExternalContextAlbum:0.0.1\" null values are illegal on key \"TestExternalContextItem00A\" for put()"));
             }
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem00A().equals(tciAA));
+            assert (externalContextItem.getTestExternalContextItem00A().equals(tciAA));
 
             // Should return the hash set
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem00B().getSetValue().equals(testTreeSet));
+            assert (externalContextItem.getTestExternalContextItem00B().getSetValue().equals(testTreeSet));
 
             assert (externalContextAlbum.values().containsAll(mapValues));
 
@@ -433,12 +413,14 @@ public class ContextInstantiation {
             externalContextOther.setTestExternalContextItem002(new TestContextItem002());
             externalContextOther.getTestExternalContextItem002().setIntValue(2000);
 
-            assert (externalContextAlbum.put("externalContext", externalContextOther).equals(externalContext));
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem002().getIntValue() == 2000);
-            assert (externalContextAlbum.put("externalContext", externalContext).equals(externalContextOther));
-            assert (((TestExternalContextItem) externalContextAlbum.get("externalContext"))
-                    .getTestExternalContextItem002().getIntValue() == -1);
+            final Object object = externalContextAlbum.put("externalContext", externalContextOther);
+            assert (object.equals(externalContext));
+
+            final TestExternalContextItem item = (TestExternalContextItem) externalContextAlbum.get("externalContext");
+            assert (item.getTestExternalContextItem002().getIntValue() == 2000);
+            final Object actualExternalContext = externalContextAlbum.put("externalContext", externalContext);
+            assert (actualExternalContext.equals(externalContextOther));
+            assert (externalContextItem.getTestExternalContextItem002().getIntValue() == -1);
 
             try {
                 externalContextAlbum.put("TestExternalContextItem00A", null);
@@ -471,16 +453,16 @@ public class ContextInstantiation {
             assert (externalContextAlbum.values().size() == 1);
             assert (externalContextAlbum.values().containsAll(mapValues));
             // CHECKSTYLE:ON: checkstyle:magicNumber
-        } catch (final Exception e) {
-            e.printStackTrace();
+        } catch (final Exception exception) {
+            LOGGER.error("Error: ", exception);
             contextDistributor.clear();
             assert ("Test has failed".equals(""));
         }
 
         try {
             contextDistributor.clear();
-        } catch (final Exception e) {
-            e.printStackTrace();
+        } catch (final Exception exception) {
+            LOGGER.error("Error occured while clearing context distributor: ", exception);
             assert ("Test has failed".equals(""));
         }
     }
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java
index d93f15ed9..d104900c9 100644
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java
+++ b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java
@@ -143,11 +143,15 @@ public class ContextUpdate {
             assert (e.getMessage().equals("album \"LongContextAlbum:0.0.1\" null keys are illegal on keys for put()"));
         }
 
-        assert (dateContextAlbum.put("date0", tciA) == null);
-        assert (dateContextAlbum.put("date0", tciA).equals(tciA));
-
-        assert (mapContextAlbum.put("map0", tciC) == null);
-        assert (mapContextAlbum.put("map0", tciC).equals(tciC));
+        Object object = dateContextAlbum.put("date0", tciA);
+        assert (object == null);
+        object = dateContextAlbum.put("date0", tciA);
+        assert (object.equals(tciA));
+
+        object = mapContextAlbum.put("map0", tciC);
+        assert (object == null);
+        object = mapContextAlbum.put("map0", tciC);
+        assert (object.equals(tciC));
 
         contextDistributor.clear();
         // CHECKSTYLE:ON: checkstyle:magicNumber
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiation.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiation.java
index 28439b716..e22321cdf 100644
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiation.java
+++ b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiation.java
@@ -73,8 +73,8 @@ public class SequentialContextInstantiation {
         Distributor contextDistributor = null;
         try {
             contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-        } catch (final Exception e) {
-            e.printStackTrace();
+        } catch (final Exception exception) {
+            LOGGER.error("Error occured while Instantiating Distributor for : {}", distributorKey, exception);
             assert ("Test has failed".equals(""));
             return;
         }
@@ -267,7 +267,8 @@ public class SequentialContextInstantiation {
             assert (aObject.equals(tciA03));
 
             try {
-                assert (dateAlbum.put(null, null) == null);
+                final Object object = dateAlbum.put(null, null);
+                assert (object == null);
             } catch (final Exception e) {
                 assert (e.getMessage()
                         .equals("album \"DateContextAlbum:0.0.1\" null keys are illegal on keys for put()"));
@@ -327,16 +328,16 @@ public class SequentialContextInstantiation {
             assert (dateAlbum.size() == 7);
             assert (dateAlbumCopy.values().containsAll(mapValues));
             // CHECKSTYLE:ON: checkstyle:magicNumber
-        } catch (final Exception e) {
-            e.printStackTrace();
+        } catch (final Exception exception) {
+            LOGGER.error("Error: ", exception);
             contextDistributor.clear();
             assert ("Test has failed".equals(""));
         }
 
         try {
             contextDistributor.clear();
-        } catch (final Exception e) {
-            e.printStackTrace();
+        } catch (final Exception exception) {
+            LOGGER.error("Error occured while clearing context distributor", exception);
             assert ("Test has failed".equals(""));
         }
     }
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java
index 971d0c421..35db5ddf6 100644
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java
+++ b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java
@@ -68,9 +68,9 @@ public class ConcurrentContext {
 
         try {
             concurrentContext.setupAndVerifyContext();
-        } catch (final Exception e) {
-            e.printStackTrace();
-            throw e;
+        } catch (final Exception exception) {
+            LOGGER.error("Error occured while setting up and verifying concurrent context", exception);
+            throw exception;
         }
 
         LOGGER.debug("starting JVMs and threads . . .");
@@ -181,8 +181,8 @@ public class ConcurrentContext {
         try {
             LOGGER.debug("threads finished, end value is {}",
                     ((TestContextItem003) lTypeAlbum.get("testValue")).getLongValue());
-        } catch (final Exception e) {
-            e.printStackTrace();
+        } catch (final Exception exception) {
+            LOGGER.error("Error: ", exception);
         }
         final long total = ((TestContextItem003) lTypeAlbum.get("testValue")).getLongValue();
 
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVMThread.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVMThread.java
index 0f8234196..020eed898 100644
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVMThread.java
+++ b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVMThread.java
@@ -114,10 +114,11 @@ public class ConcurrentContextJVMThread implements Runnable {
                 final int exitValue = process.waitFor();
                 LOGGER.info("\n\nJVM " + jvm + " finished, exit value is " + exitValue);
             } catch (final InterruptedException e) {
-                e.printStackTrace();
+                LOGGER.warn("Thread was interrupted");
+                Thread.currentThread().interrupt();
             }
-        } catch (final IOException e1) {
-            e1.printStackTrace();
+        } catch (final IOException ioException) {
+            LOGGER.error("Error occured while writing JVM Output for command ", ioException);
         }
     }
 }
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextThread.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextThread.java
index 0691b8ae5..6ffacbb6c 100644
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextThread.java
+++ b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextThread.java
@@ -93,39 +93,18 @@ public class ConcurrentContextThread implements Runnable {
         }
 
         // @formatter:off
-        final AxArtifactKey[] usedArtifactStackArray = {
-                new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"),
-                new AxArtifactKey("testC-bot", "0.0.1")
-                };
+        final AxArtifactKey[] usedArtifactStackArray = {new AxArtifactKey("testC-top", "0.0.1"),
+                new AxArtifactKey("testC-next", "0.0.1"), new AxArtifactKey("testC-bot", "0.0.1")};
         // @formatter:on
 
         lTypeAlbum.setUserArtifactStack(usedArtifactStackArray);
 
-        for (int i = 0; i < threadLoops; i++) {
-            try {
-                lTypeAlbum.lockForWriting("testValue");
-                TestContextItem003 item = (TestContextItem003) lTypeAlbum.get("testValue");
-                if (item != null) {
-                    long value = item.getLongValue();
-                    item.setLongValue(++value);
-                } else {
-                    item = new TestContextItem003(0L);
-                }
-                lTypeAlbum.put("testValue", item);
-            } catch (final Exception e) {
-                LOGGER.error("could not set the value in the test context album", e);
-                LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
-                return;
-            } finally {
-                try {
-                    lTypeAlbum.unlockForWriting("testValue");
-                } catch (final ContextException e) {
-                    LOGGER.error("could not unlock test context album item", e);
-                    LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
-                    return;
-                }
-            }
+        try {
+            updateAlbum(lTypeAlbum);
+        } catch (final Exception exception) {
+            LOGGER.error("could not set the value in the test context album", exception);
+            LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
+            return;
         }
 
         try {
@@ -146,4 +125,28 @@ public class ConcurrentContextThread implements Runnable {
             }
         }
     }
+
+    private void updateAlbum(final ContextAlbum lTypeAlbum) throws Exception {
+        for (int i = 0; i < threadLoops; i++) {
+            try {
+                lTypeAlbum.lockForWriting("testValue");
+                TestContextItem003 item = (TestContextItem003) lTypeAlbum.get("testValue");
+                if (item != null) {
+                    long value = item.getLongValue();
+                    item.setLongValue(++value);
+                } else {
+                    item = new TestContextItem003(0L);
+                }
+                lTypeAlbum.put("testValue", item);
+            } catch (final Exception exception) {
+                throw exception;
+            } finally {
+                try {
+                    lTypeAlbum.unlockForWriting("testValue");
+                } catch (final ContextException contextException) {
+                    throw contextException;
+                }
+            }
+        }
+    }
 }
diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
index b35492356..077065bb5 100644
--- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
+++ b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
@@ -491,7 +491,7 @@ public class AxEngineStats extends AxConcept {
         if (lastExecutionTime != other.lastExecutionTime) {
             return false;
         }
-        if (averageExecutionTime != other.averageExecutionTime) {
+        if (Double.compare(averageExecutionTime, other.averageExecutionTime) != 0) {
             return false;
         }
         if (upTime != other.upTime) {