- }catch (ForwardProgressException e){
- String message = "GET:/pap/test called and PAP " + papResourceName + " is not making forward progress."
- + " Exception Message: " + e.getMessage();
- logMessage(e, message, loggingContext, response);
- return;
- }catch (AdministrativeStateException e){
- String message = "GET:/pap/test called and PAP " + papResourceName + " Administrative State is LOCKED."
- + " Exception Message: " + e.getMessage();
- logMessage(e, message, loggingContext, response);
- return;
- }catch (StandbyStatusException e){
- String message = "GET:/pap/test called and PAP " + papResourceName + " Standby Status is NOT PROVIDING SERVICE."
- + " Exception Message: " + e.getMessage();
- logMessage(e, message, loggingContext, response);
- return;
+ }catch (ForwardProgressException | AdministrativeStateException | StandbyStatusException e){
+ String submsg;
+ if (e instanceof ForwardProgressException) {
+ submsg = " is not making forward progress.";
+ } else if (e instanceof AdministrativeStateException) {
+ submsg = " Administrative State is LOCKED.";
+ } else {
+ submsg = " Standby Status is NOT PROVIDING SERVICE.";
+ }
+
+ String message = "GET:/pap/test called and PAP " + papResourceName + submsg
+ + " Exception Message: " + e.getMessage();
+ LOGGER.info(message, e);
+ PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
+ loggingContext.transactionEnded();
+ PolicyLogger.audit("Transaction Failed - See Error.log");
+ setResponseError(response,HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
+ return;