Resolved Fortify System Information Leak issues

Issue-ID: POLICY-550
Change-Id: I2145ecb6de43b69d6faf44c6395b119134a9904f
Signed-off-by: rb7147 <rb7147@att.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java
index babcafaeb..32bbc2caf 100644
--- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java
@@ -46,13 +46,12 @@ public class XACMLPdpPIPFinderFactory extends PIPFinderFactory {
 
 	@Override
 	public PIPFinder getFinder() throws PIPException {
-		if (pipFinder == null) {
 			synchronized(this) {
 				if (pipFinder == null) {
 					if (LOGGER.isDebugEnabled()) {
 						LOGGER.debug("Creating default configurable engine finder");
 					}
-					pipFinder					= new ConfigurableEngineFinder();
+					pipFinder = new ConfigurableEngineFinder();
 					Properties xacmlProperties	= null;
 					try {
 						xacmlProperties	= XACMLProperties.getProperties();
@@ -66,21 +65,18 @@ public class XACMLPdpPIPFinderFactory extends PIPFinderFactory {
 					}
 				}
 			}
-		}
 		return pipFinder;
 	}
 
 	@Override
 	public PIPFinder getFinder(Properties properties) throws PIPException {
-		if (pipFinder == null) {
-			synchronized(this) {
-				if (pipFinder == null) {
-					if (LOGGER.isDebugEnabled()) {
+		synchronized(this) {
+			if (pipFinder == null) {
+				if (LOGGER.isDebugEnabled()) {
 						LOGGER.debug("Creating configurable engine finder using: " + properties);
-					}
-					pipFinder					= new ConfigurableEngineFinder();
-					((ConfigurableEngineFinder)pipFinder).configure(properties);
 				}
+				pipFinder = new ConfigurableEngineFinder();
+				((ConfigurableEngineFinder)pipFinder).configure(properties);
 			}
 		}
 		return this.pipFinder;