X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fportal%2Fcontroller%2FRolesApprovalSystemController.java;h=3dba301aa93cb728c9aa1e2fa93ab9441d6b50fc;hb=978dbcf0a196acbafad72fe1e2478ec0e384f02f;hp=c150528ea19eba381a188e0654038aa0651cd71e;hpb=bc7350dce5b7b1dcd1c472a3922b42c4ea99809d;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java
index c150528e..3dba301a 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java
@@ -78,7 +78,7 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl
 		} catch (Exception e) {
 			logger.error(EELFLoggerDelegate.errorLogger, "postUserProfile: failed for app {}, user {}",
 					extSysUser.getApplicationName(), extSysUser.getLoginId(), e);
-			if(reqResult == null || (!reqResult.isResult()  && !e.getMessage().contains("404"))){
+			if(reqResult == null || (!reqResult.isResult()  && !e.getMessage().contains("404") && !e.getMessage().contains("405"))){
 				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR,
 						e.getMessage(), "save user profile failed"); 
@@ -86,10 +86,14 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl
 				response.setStatus(HttpServletResponse.SC_NOT_FOUND);
 				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR,
 						e.getMessage(), "save user profile failed");
-			} else{
+			} else if (e.getMessage().contains("405")) {
+				response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(),
+						"save user profile failed");
+			} else {
 				response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR,
-						e.getMessage(), "save user profile failed");
+				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(),
+						"save user profile failed");
 			}
 		}
 		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, reqResult.getDetailMessage(), "Success");
@@ -117,7 +121,7 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl
 		} catch (Exception e) {
 			logger.error(EELFLoggerDelegate.errorLogger, "putUserProfile: failed for app {}, user {}",
 					extSysUser.getApplicationName(), extSysUser.getLoginId(), e);
-			if(reqResult == null || (!reqResult.isResult()  && !e.getMessage().contains("404"))){
+			if(reqResult == null || (!reqResult.isResult()  && !e.getMessage().contains("404") && !e.getMessage().contains("405"))){
 				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR,
 						e.getMessage(), "save user profile failed"); 
@@ -125,6 +129,9 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl
 				response.setStatus(HttpServletResponse.SC_NOT_FOUND);
 				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR,
 						e.getMessage(), "save user profile failed");
+			} else if (e.getMessage().contains("405")) {
+				response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "save user profile failed");
 			} else{
 				response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR,