X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Futil%2FJPAUtils.java;h=e18ca9ebd5534b4c5cd4f09a97cf5e3b62ba2471;hb=ed2bcd773ec3dbe07311bad597ec664c4e38c009;hp=05885ee16f4e3b69ddaabd0400d77d85699f5ab1;hpb=cbc5914ca2c1770797f6ad2a05ea9d7c30a55b63;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
index 05885ee16..e18ca9ebd 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
@@ -43,7 +43,7 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 
 public class JPAUtils {
-	private static Logger LOGGER	= FlexLogger.getLogger(JPAUtils.class);
+	private static final Logger LOGGER	= FlexLogger.getLogger(JPAUtils.class);
 	
 	private static EntityManagerFactory emf;
 	private static final Object mapAccess = new Object();
@@ -73,7 +73,7 @@ public class JPAUtils {
 	
 	private JPAUtils(EntityManagerFactory emf){
 		LOGGER.debug("JPAUtils(EntityManagerFactory emf) as JPAUtils("+emf+") called");
-		this.emf = emf;	
+		JPAUtils.emf = emf;	
 	}
 	
 	/**
@@ -169,7 +169,7 @@ public class JPAUtils {
 		for (Object id : functionList) {
 			FunctionDefinition value = (FunctionDefinition)id;
 			mapID2Function.put(value.getXacmlid(), value);
-			if (mapDatatype2Function.containsKey(value.getDatatypeBean()) == false) {
+			if (!mapDatatype2Function.containsKey(value.getDatatypeBean())) {
 				mapDatatype2Function.put(value.getDatatypeBean(), new ArrayList<FunctionDefinition>());
 			}
 			mapDatatype2Function.get(value.getDatatypeBean()).add(value);