summaryrefslogtreecommitdiffstats
path: root/ONAP-PDP-REST/src/main
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2018-02-19 11:53:40 -0500
committerJim Hahn <jrh3@att.com>2018-02-19 12:00:52 -0500
commite5c628fee6a6e6bb57a34d5b73e092d89ee26a5c (patch)
treedfa2df1b7f0933f8d2714863b63de434b330fa87 /ONAP-PDP-REST/src/main
parentb13f494b5573118a07b434389fe8f73fc5986e4b (diff)
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 <jrh3@att.com>
Diffstat (limited to 'ONAP-PDP-REST/src/main')
-rw-r--r--ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java7
1 files changed, 4 insertions, 3 deletions
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();