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>

2 files changed, 6 insertions, 8 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();
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
index 594b51c06..e8747f736 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
@@ -42,13 +42,10 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.policy.common.ia.DbDAO;
 import org.onap.policy.common.ia.IntegrityAuditProperties;
-import org.onap.policy.common.im.AdministrativeStateException;
 import org.onap.policy.common.im.IntegrityMonitor;
-import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.im.IntegrityMonitorException;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
-
-import org.onap.policy.pdp.rest.XACMLPdpServletTest;
 import org.powermock.api.mockito.PowerMockito;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletConfig;
@@ -168,7 +165,7 @@ public class XACMLPdpServletTest extends TestCase{
 		
 		try {
 			Mockito.doNothing().when(im).startTransaction();
-		} catch (StandbyStatusException | AdministrativeStateException e) {
+		} catch (IntegrityMonitorException e) {
 			fail();
 		}
 		Mockito.doNothing().when(im).endTransaction();