diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2017-11-21 17:40:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-21 17:40:58 +0000 |
| commit | 522edbec8a09d2aa7514980b6e8593015d75814d (patch) | |
| tree | 90cbfad576fdcc421d86a4a60c6075ecc029c247 | |
| parent | 655c34d4893baecb4052cc3c6524c8b7301bdfae (diff) | |
| parent | d93245a8de9cf3adc381fa065f20d4199a9dcde8 (diff) | |
Merge "Fix fortify issues identified in drools"
| -rw-r--r-- | feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java | 2 | ||||
| -rw-r--r-- | policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java | 15 |
2 files changed, 7 insertions, 10 deletions
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 e0ada747..e48bd2fa 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 @@ import org.onap.policy.drools.system.PolicyEngine; 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 84043d8f..d69ea339 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 @@ public class PropertyUtil // 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); } } |