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%2Fpolicycontroller%2FPolicyCreation.java;h=76fe4ae5de91736ff4f6da949ea6594d43ce3431;hb=82e81ac60d97b93847a26accc071e7043d831ab0;hp=d989470a2baf05c45f555edce3a5dab300a0ed0c;hpb=1bfd18f999cda39a7b27bef8972864aafe59aecb;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
index d989470a2..76fe4ae5d 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
@@ -115,7 +115,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 				policyData.setTtlDate("NA");
 			}else{
 				String dateTTL = policyData.getTtlDate();
-				String newDate = convertDate(dateTTL, false);
+				String newDate = convertDate(dateTTL);
 				policyData.setTtlDate(newDate);
 			}
 
@@ -193,6 +193,15 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					return new ResponseEntity<String>(body, status);
 				}		
 			}else{
+				// if policy does not exist and the request is updatePolicy return error
+				if(policyData.isEditPolicy()){
+					body = "policyNotAvailableForEdit";
+					status = HttpStatus.NOT_FOUND;
+					response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+					response.addHeader("error", body);
+					response.addHeader("message", policyData.getPolicyName() + " does not exist on the PAP and cannot be updated.");
+					return new ResponseEntity<>(body, status);
+				}
 				version = 1;
 				if(userId == null){
 					createdBy = "API";