X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyManagerServlet.java;h=b28850dd72910e3a3d0cc8e30bd8b90fa86858e4;hb=1cb0fbfc4993c1f47f31b061d70b64f53247df95;hp=9498529aff226e908c9432f0712d0e6e74a21434;hpb=695d88bd7a987a06173fc4fa13f4135916a79a86;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
index 9498529af..b28850dd7 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
@@ -530,16 +530,15 @@ public class PolicyManagerServlet extends HttpServlet {
 		}
 		try (BufferedWriter bw = new BufferedWriter(new FileWriter(temp))) {
 			bw.write(entity.getPolicyData());
-			object = HumanPolicyComponent.DescribePolicy(temp);
 		} catch (IOException e) {
 			LOGGER.error("Exception Occured while Describing the Policy"+e);
-		}finally{
-			if(temp != null){
-				try {
-					Files.delete(temp.toPath());
-				} catch (IOException e) {
-					LOGGER.warn("Failed to delete " + temp.getName() + e);
-				}
+		}
+		object = HumanPolicyComponent.DescribePolicy(temp);
+		if(temp != null){
+			try {
+				Files.delete(temp.toPath());
+			} catch (IOException e) {
+				LOGGER.warn("Failed to delete " + temp.getName() + e);
 			}
 		}
 		return object;
@@ -1123,7 +1122,11 @@ public class PolicyManagerServlet extends HttpServlet {
 			SimpleBindings peParams = new SimpleBindings();
 			peParams.put("oldPolicySplit_1", oldPolicySplit[1]);
 			peParams.put("oldPolicySplit_0", oldPolicySplit[0]);
-			queryData = controller.getDataByQuery(policyEntityquery, peParams);
+			if(PolicyController.isjUnit()){
+				queryData = controller.getDataByQuery(policyEntityquery, null);
+			}else{
+				queryData = controller.getDataByQuery(policyEntityquery, peParams);
+			}
 			if(!queryData.isEmpty()){
 				entity = (PolicyEntity) queryData.get(0);
 			}