Merge "Fix Blocker/Critical sonar issues"

1 files changed, 6 insertions, 5 deletions

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java
index 741169c3..486d0ccc 100644
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java
@@ -21,10 +21,6 @@
 package org.onap.ccsdk.sli.core.dblib.factory;
 
 
-import java.sql.SQLException;
-import java.util.Set;
-import java.util.concurrent.Callable;
-
 import org.onap.ccsdk.sli.core.dblib.CachedDataSource;
 import org.onap.ccsdk.sli.core.dblib.CachedDataSourceFactory;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
@@ -34,6 +30,10 @@ import org.onap.ccsdk.sli.core.dblib.config.JDBCConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.SQLException;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
 /**
  * @version $Revision: 1.6 $
  * Change Log
@@ -84,7 +84,8 @@ public abstract class AbstractResourceManagerFactory {
 							}
 						};
 						if (LOGGER.isDebugEnabled()) {
-							LOGGER.debug("Completed CachedDataSource.Call and notifyAll from " + ds.getDbConnectionName());
+							LOGGER.debug("Completed CachedDataSource.Call and notifyAll from " + (ds != null ? ds
+									.getDbConnectionName() : null));
 						}
 						Thread worker = new Thread(closure);
 						worker.setDaemon(true);