Merge "JUnit additions for PDP-REST,ONAP-SDK-APP"

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
index 2fb6367..71eb115 100644 (file)
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
@@ -358,7 +358,7 @@ public class PolicyDBDao {
                                } catch(Exception e2){
                                        PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e2, policyDBDaoVar, "COULD NOT CREATE DATABASELOCK ROW.  WILL TRY ONE MORE TIME");
                                }
-                               em = null;
+                               
                                em = emf.createEntityManager();
                                try{
                                        startTransactionSynced(em, 1000);

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index 70ad8b5..c6536c8 100644 (file)
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:14.04
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG POLICY_LOGS=/var/log/policy
+ARG POLICY_LOGS=/var/log/ONAP/policy
 
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY