[SDNC-5] Rebase sdnc-core

Upgrade to OpenDaylight Boron release, and sync changes made since 16.10 release to ONAP SDN-C distribution

Change-Id: I20bef9e6d0008c4436b5624ce839bbb70ecc20a5
Signed-off-by: Dan Timoney <dtimoney@att.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java
index 148ddac..29ec061 100644
--- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java
+++ b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java
@@ -32,7 +32,6 @@ import org.openecomp.sdnc.sli.resource.dblib.DBResourceManager;
 import org.openecomp.sdnc.sli.resource.dblib.config.BaseDBConfiguration;
 import org.openecomp.sdnc.sli.resource.dblib.config.DbConfigPool;
 import org.openecomp.sdnc.sli.resource.dblib.config.JDBCConfiguration;
-import org.openecomp.sdnc.sli.resource.dblib.config.JndiConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,20 +48,15 @@ public abstract class AbstractResourceManagerFactory {
 	public abstract CachedDataSource[] initDBResourceManager(DbConfigPool dbConfig, DBResourceManager manager) throws Exception;
 	public abstract CachedDataSource[] initDBResourceManager(DbConfigPool dbConfig,	DBResourceManager dbResourceManager, String sourceName) throws SQLException ;
 
-	
+
 	public static AbstractResourceManagerFactory createIntstance() throws FactoryNotDefinedException {
 		throw new FactoryNotDefinedException("Factory method 'createIntstance' needs to be overriden in DBResourceManagerFactory");
 	}
 
-	public class DBInitTask implements Callable<CachedDataSource> 
+	public class DBInitTask implements Callable<CachedDataSource>
 	{
 		private BaseDBConfiguration config = null;
 		private Set<DBInitTask> activeTasks;
-		
-		public DBInitTask(JndiConfiguration jndiConfig, Set<DBInitTask> tasks){
-			this.config = jndiConfig;
-			this.activeTasks = tasks;
-		}
 
 		public DBInitTask(JDBCConfiguration jdbcconfig, Set<DBInitTask> tasks) {
 			this.config = jdbcconfig;
@@ -97,6 +91,7 @@ public abstract class AbstractResourceManagerFactory {
 						worker.start();
 					} else {
 						if(LOGGER.isDebugEnabled())
+							if(ds != null)
 							LOGGER.debug("Completed CachedDataSource.Call from "+ds.getDbConnectionName());
 					}
 				}