Merge "Fix fortify issues identified in drools"
diff --git a/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java b/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
index e0ada74..e48bd2f 100644
--- a/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
+++ b/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
@@ -36,7 +36,7 @@
public class EelfFeature implements PolicyEngineFeatureAPI {
@Override
- public boolean beforeBoot(PolicyEngine engine, String cliArgs[]) {
+ final public boolean beforeBoot(PolicyEngine engine, String cliArgs[]) {
String logback = System.getProperty(Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY,
Main.LOGBACK_CONFIGURATION_FILE_DEFAULT);
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
index 84043d8..d69ea33 100644
--- a/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
@@ -147,17 +147,14 @@
// add to static table, so this instance can be shared
registrations.put(file, this);
- if (timer == null)
+ // still need to create a timer thread
+ synchronized(PropertyUtil.class)
{
- // still need to create a timer thread
- synchronized(PropertyUtil.class)
+ // an additional check is added inside the 'synchronized' block,
+ // just in case someone beat us to it
+ if (timer == null)
{
- // an additional check is added inside the 'synchronized' block,
- // just in case someone beat us to it
- if (timer == null)
- {
- timer = new Timer("PropertyUtil-Timer", true);
- }
+ timer = new Timer("PropertyUtil-Timer", true);
}
}