summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-13 20:50:22 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-13 20:50:22 +0000
commit5e8195e2b299a87edae0e3cb0f9ad5c38759beb7 (patch)
treed93da48a725e8c73400dc723d21b5a3a8cbc6440
parentd315e6996052dc81c7e5deebd7fc4229a4e93c0c (diff)
parentcce6f1cd01d319d7d01b3bc9be0ff903621ce1ec (diff)
Merge "Fix Blocker/Critical sonar issues"
-rw-r--r--dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java11
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);