From e5c628fee6a6e6bb57a34d5b73e092d89ee26a5c Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 19 Feb 2018 11:53:40 -0500 Subject: Fix compilation issue due to generic Exception After modifying common to remove generic Exceptions, policy/engine would no longer compile. Had to modify policy/engine to accomodate the specific exception. Change-Id: If339285235994119009a8dcf9484bc81016e2600 Issue-ID: POLICY-246 Signed-off-by: Jim Hahn --- .../src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ONAP-PDP-REST/src/main') diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java index 608295325..567ff2e78 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java @@ -52,6 +52,7 @@ import org.onap.policy.api.PolicyParameters; import org.onap.policy.common.im.AdministrativeStateException; import org.onap.policy.common.im.ForwardProgressException; import org.onap.policy.common.im.IntegrityMonitor; +import org.onap.policy.common.im.IntegrityMonitorException; import org.onap.policy.common.im.IntegrityMonitorProperties; import org.onap.policy.common.im.StandbyStatusException; import org.onap.policy.common.logging.ONAPLoggingContext; @@ -445,7 +446,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable { try { im.startTransaction(); } - catch (AdministrativeStateException | StandbyStatusException e) { + catch (IntegrityMonitorException e) { String message = e.toString(); PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR, message + e); loggingContext.transactionEnded(); @@ -744,7 +745,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable { try { im.startTransaction(); } - catch (AdministrativeStateException | StandbyStatusException e) { + catch (IntegrityMonitorException e) { String message = e.toString(); PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR, message); loggingContext.transactionEnded(); @@ -864,7 +865,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable { try { im.startTransaction(); } - catch (AdministrativeStateException | StandbyStatusException e) { + catch (IntegrityMonitorException e) { String message = e.toString(); PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR, message + e); loggingContext.transactionEnded(); -- cgit 1.2.3-korg