Sonar Scans and Role Centralization; clean nl

PORTAL-21: centralized user role management
PORTAL-72: Address Sonar Scan code issues for ONAP - mostly on raptor
PORTAL-86: ONAP - Remove internal att.com usages from tests and otherfiles
PORTAL-90: Add debug statements to demo app's class; no functional change

Issue: PORTAL-21 PORTAL-72 PORTAL-86 PORTAL-90
Change-Id: I72a6c812009f51446330bf42bab6d3338d053805
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SchedulerUtil.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SchedulerUtil.java
index 88dc98ad..8404dc2b 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SchedulerUtil.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SchedulerUtil.java
@@ -91,7 +91,8 @@ public class SchedulerUtil {
 			stat.executeUpdate(sql);
 			
 		} finally{
-			stat.close();
+			if(stat!=null)
+				stat.close();
 			//conn.close();
 		}
 	}
@@ -113,7 +114,8 @@ public class SchedulerUtil {
     		stat.executeUpdate();
     	
     	} finally{
-			stat.close();
+    		if(stat!=null)
+    			stat.close();
 		}
         	
     }
@@ -195,7 +197,8 @@ public class SchedulerUtil {
 			stat.executeUpdate();
 			
 		} finally{
-			stat.close();
+			if(stat!=null)
+				stat.close();
 			//conn.close();
 		}
 	}