From b48ea0e307f5977b5d2b9dcc4ebb22a7bc3f1710 Mon Sep 17 00:00:00 2001 From: PawelSzalapski Date: Tue, 5 Jun 2018 10:54:27 +0200 Subject: Fix bug about custom exceptions not being used The bug was that custom exception config was never actually queried because of the mismatch between the production code usages and .json config file. Change-Id: I416ef5f45770f9bb55d5dff143277b6c62fa25ba Issue-ID: DCAEGEN2-518 Signed-off-by: PawelSzalapski --- src/main/java/org/onap/dcae/commonFunction/CommonStartup.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/main/java/org/onap/dcae/commonFunction/CommonStartup.java') diff --git a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java index f16cdbbc..0ca25e2b 100644 --- a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java +++ b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java @@ -92,7 +92,6 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable { public static final String KSETTING_SCHEMAFILE = "collector.schema.file"; public static final String KDEFAULT_SCHEMAFILE = "{\"v5\":\"./etc/CommonEventFormat_28.3.json\"}"; - public static final String KSETTING_EXCEPTIONCONFIG = "exceptionConfig"; public static final String KSETTING_DMAAPSTREAMID = "collector.dmaap.streamid"; @@ -114,7 +113,6 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable { public static int eventTransformFlag = 1; public static String schemaFile; public static JSONObject schemaFileJson; - public static String exceptionConfig; public static String cambriaConfigFile; private boolean listnerstatus; public static String streamid; @@ -155,7 +153,6 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable { schemaFileJson = new JSONObject(schemaFile); } - exceptionConfig = settings.getString(KSETTING_EXCEPTIONCONFIG, null); authflag = settings.getInt(CommonStartup.KSETTING_AUTHFLAG, CommonStartup.KDEFAULT_AUTHFLAG); String[] currentconffile = settings.getStrings(CommonStartup.KSETTING_DMAAPCONFIGS, CommonStartup.KDEFAULT_DMAAPCONFIGS); @@ -166,8 +163,6 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable { fTomcatServer = new ApiServer.Builder(connectors, new RestfulCollectorServlet(settings)).encodeSlashes(true) .name("collector").build(); - // Load override exception map - CustomExceptionLoader.LoadMap(); setListnerstatus(true); } -- cgit 1.2.3-korg