From ba7e52156a998a5cffc59a95c05d104074a23964 Mon Sep 17 00:00:00 2001 From: Arundathi Patil Date: Mon, 27 Aug 2018 16:51:35 +0530 Subject: MusicHealthCheck.java- Fixed sonar issue Fixed sonar issue, A nullpointer exception could be thrown Issue-ID: MUSIC-108 Change-Id: Id025658bde7b92bbacd940fc6c2121fc84086ea6 Signed-off-by: Arundathi Patil --- .../java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java b/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java index 9c3e842e..af6e6151 100644 --- a/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java +++ b/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java @@ -56,16 +56,19 @@ public class MusicHealthCheck { result = getAdminKeySpace(consistency); } catch(Exception e) { if(e.getMessage().toLowerCase().contains("unconfigured table healthcheck")) { - System.out.println("Creating table...."); + logger.error("Error", e); + logger.debug("Creating table...."); boolean ksresult = createKeyspace(); if(ksresult) try { result = getAdminKeySpace(consistency); } catch (MusicServiceException e1) { // TODO Auto-generated catch block + logger.error("Error", e); e1.printStackTrace(); } } else { + logger.error("Error", e); return "One or more nodes are down or not responding."; } } @@ -103,8 +106,9 @@ public class MusicHealthCheck { } catch (MusicServiceException e) { // TODO Auto-generated catch block e.printStackTrace(); + logger.error("Error", e); } - if(rs.getResult().toLowerCase().contains("success")) + if(rs != null && rs.getResult().toLowerCase().contains("success")) return true; else return false; @@ -126,8 +130,6 @@ public class MusicHealthCheck { logger.info(EELFLoggerDelegate.applicationLogger, "Zookeeper is Active and Running"); return "ACTIVE"; - // return "Zookeeper is not responding"; - } public String getCassandrHost() { -- cgit 1.2.3-korg