Fix NPE & other sonar in epsdk-analytics

A "NullPointerException" could be thrown
Use a logger to log this exception

Issue-ID: PORTAL-562
Change-Id: I0ee2a761136167fd6c2e1d868ae8359eba78462f
Signed-off-by: Parshad Patel <pars.patel@samsung.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java
index d36de7e9..2d46326b 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java
@@ -234,7 +234,7 @@ public class ReportParamValues extends Hashtable {
 				value = Utils.oracleSafe(nvl(value));
 				value = value.replaceAll(",","|");
 				if(nvl(value).length()>0) {
-					if(value.indexOf("|")!= -1) {  // Need option to support "|"
+					if(nvl(value).indexOf("|")!= -1) {  // Need option to support "|"
 						value = Utils.replaceInString(value,"\r\n","~");
 				}
 					value = Utils.replaceInString(value, "~", "' , '");
@@ -379,7 +379,7 @@ public class ReportParamValues extends Hashtable {
 			else 
 				return "";
 		} catch (RaptorException ex) {
-			ex.printStackTrace();
+            logger.error(EELFLoggerDelegate.errorLogger, "RaptorException in getDateAsString", ex);
 			//throw ex;
 		}
 		return "";