Fix Blocker/Critical sonar issues

Fix Blocker/Critical sonar issues in vnfapi module
https://sonar.onap.org/component_issues?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#severities=BLOCKER

Issue-Id: CCSDK-67
Change-Id: I0b779cb0db33f0742776062bd7fa7173f08d5e62
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

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 6fc7e7a..486d0cc 100644 (file)
--- 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,13 +21,8 @@
 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.DBConfigException;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
 import org.onap.ccsdk.sli.core.dblib.config.BaseDBConfiguration;
 import org.onap.ccsdk.sli.core.dblib.config.DbConfigPool;
@@ -35,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
@@ -85,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);