1 files changed, 3 insertions, 3 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java
index 8b968cc8..fd5fdba1 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java
@@ -44,7 +44,7 @@ public class RaptorObject extends java.lang.Object {
 	}
 
 	protected String nvl(String s, String sDefault) {
-		return nvl(s).equals("") ? sDefault : s;
+		return nvl(s).isEmpty() ? sDefault : s;
 	}
 
 	protected static String nvls(String s) {
@@ -52,11 +52,11 @@ public class RaptorObject extends java.lang.Object {
 	}
 
 	protected static String nvls(String s, String sDefault) {
-		return nvls(s).equals("") ? sDefault : s;
+		return nvls(s).isEmpty() ? sDefault : s;
 	}
 	
 	protected boolean getFlagInBoolean(String s) {
-		return nvl(s).toUpperCase().startsWith("Y") || nvl(s).toLowerCase().equals("true");
+		return nvl(s).toUpperCase().startsWith("Y") || "true".equalsIgnoreCase(nvl(s));
 	}
 
 } // RaptorObject