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=2af8a6ee1ae64530447ab615e78a0e7bc6f7c583;hb=b6bae924c4a794cd772ac1524089fc8739e310b1;hp=80657fcd678c49f4089937b0dabcca02fda74682;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;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 80657fcd6..2af8a6ee1 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
@@ -99,7 +99,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 	
 	@RequestMapping(value="/policycreation/save_policy", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> savePolicy(@RequestBody PolicyRestAdapter policyData, HttpServletResponse response) throws Exception{
+	public ResponseEntity<String> savePolicy(@RequestBody PolicyRestAdapter policyData, HttpServletResponse response){
 		String body = null;
 		HttpStatus status = HttpStatus.BAD_REQUEST;
 		Map<String, String> successMap = new HashMap<>();
@@ -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<String>(body, status);
+				}
 				version = 1;
 				if(userId == null){
 					createdBy = "API";
@@ -512,13 +521,14 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					response.addHeader("error", "error");							
 				}
 			}catch(Exception e){
+				LOGGER.error("Exception Occured : ",e);
 				if(policyDBDaoTransaction != null){
 					policyDBDaoTransaction.rollbackTransaction();
 				}
 			}
 		}
 		catch (Exception e){
-			LOGGER.error("Exception Occured : "+e);
+			LOGGER.error("Exception Occured : "+e.getMessage(),e);
 			body = "error";
 			response.addHeader("error", e.getMessage());	
 			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);