summaryrefslogtreecommitdiffstats
path: root/LogParser
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 /LogParser
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 'LogParser')
-rw-r--r--LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java9
-rw-r--r--LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java3
2 files changed, 5 insertions, 7 deletions
diff --git a/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java b/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
index 259b2cb03..5ead822b6 100644
--- a/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
+++ b/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
@@ -46,9 +46,8 @@ import java.util.regex.Pattern;
import java.util.stream.Stream;
import org.apache.log4j.Logger;
-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.utils.CryptoUtils;
import org.onap.xacml.parser.LogEntryObject.LOGTYPE;
@@ -579,10 +578,8 @@ public class ParseLog {
if (im!=null){
try {
im.startTransaction();
- } catch (AdministrativeStateException e) {
- logger.error("Error received" + e);
- } catch (StandbyStatusException ex) {
- logger.error("Error received" + ex);
+ } catch (IntegrityMonitorException e) {
+ logger.error("Error received" + e);
}
}
returnLogValue = pullOutLogValues(line, type);
diff --git a/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java
index 1f42ac39b..62af131a8 100644
--- a/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java
+++ b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java
@@ -40,6 +40,7 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.onap.policy.common.im.AdministrativeStateException;
import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.IntegrityMonitorException;
import org.onap.policy.common.im.StandbyStatusException;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
@@ -488,7 +489,7 @@ public class ParseLogTest {
im = Mockito.mock(IntegrityMonitor.class);
try {
Mockito.doNothing().when(im).startTransaction();
- } catch (StandbyStatusException | AdministrativeStateException e) {
+ } catch (IntegrityMonitorException e) {
fail();
}
Mockito.doNothing().when(im).endTransaction();