diff options
author | Vijay <vv770d@att.com> | 2017-09-25 20:32:23 +0000 |
---|---|---|
committer | Vijay <vv770d@att.com> | 2017-09-25 20:32:48 +0000 |
commit | f46b942de6b6ae6e9ede19a31c43c3e081fdc4e5 (patch) | |
tree | ebc638bdec91f7c78b3db36e573c28ef14d4c668 /src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java | |
parent | 86ac6e10c0caa05a9649d53b7179b3dcd8fbd802 (diff) |
fix merge error n sonar items
https://jenkins.onap.org/job/dcaegen2-collectors-ves-master-merge-java/33/console
Change-Id: I90693665dcf650028186a47ed69eaf15bc2f0d15
Issue-ID:DCAEGEN2-82
Signed-off-by: Vijay <vv770d@att.com>
Diffstat (limited to 'src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java')
-rw-r--r-- | src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java b/src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java index c6666d63..10a1db47 100644 --- a/src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java +++ b/src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java @@ -37,7 +37,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; - public class CustomExceptionLoader { protected static HashMap<String, JsonArray> map = null; @@ -78,14 +77,10 @@ public class CustomExceptionLoader { } log.debug("CustomExceptionLoader.LoadMap --> Map loaded - " + map); - } catch (JsonIOException e) { - e.printStackTrace(); - } catch (JsonSyntaxException e) { - e.printStackTrace(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); + } catch (JsonIOException|JsonSyntaxException|FileNotFoundException e) { + log.error("Exception in LoadMap:" + e.getMessage()); + //e.printStackTrace(); + map = null; } finally { if (fr != null) { @@ -93,6 +88,7 @@ public class CustomExceptionLoader { fr.close(); } catch (IOException e) { log.error("Error closing file reader stream : " +e.toString()); + map = null; } } } @@ -130,4 +126,3 @@ public class CustomExceptionLoader { } } - |