diff options
author | Rich Tabedzki <richard.tabedzki@att.com> | 2018-03-02 04:42:45 +0000 |
---|---|---|
committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-03-02 13:28:59 -0500 |
commit | e69c6e3320f27d31d6dcd86a1ab40960758b59cb (patch) | |
tree | 241c597b8c092ebc17454b74a7fd10ee9fd0bbee /dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java | |
parent | 3cc57351f6b8e438ac6d6ed98cb098a22c62608f (diff) |
Updated master database detection algorithm
Changes made:
* updated algorithm in DBResourceManager
* Updated CachedDataSource, JdbcDBCachedDataSource
* added new unit tests
Change-Id: I4f6bbeb3839f55d183d7e762743fbc9171b63b1a
Issue-ID: CCSDK-192
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
Diffstat (limited to 'dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java')
-rwxr-xr-x | dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java index e5eff24a..02cce3cf 100755 --- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java +++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java @@ -47,7 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @version $Revision: 1.13 $ + * @version $Revision: 1.14 $ * Change Log * Author Date Comments * ============== ======== ==================================================== @@ -68,7 +68,7 @@ public abstract class CachedDataSource implements DataSource, SQLExecutionMonito protected long dataReqTimeout = 100L; private final SQLExecutionMonitor monitor; - protected DataSource ds = null; + protected final DataSource ds; protected String connectionName = null; protected boolean initialized = false; @@ -85,7 +85,7 @@ public abstract class CachedDataSource implements DataSource, SQLExecutionMonito private boolean isDerby = false; public CachedDataSource(BaseDBConfiguration jdbcElem) throws DBConfigException { - configure(jdbcElem); + ds = configure(jdbcElem); if ("org.apache.derby.jdbc.EmbeddedDriver".equals(jdbcElem.getDriverName())) { isDerby = true; @@ -93,7 +93,7 @@ public abstract class CachedDataSource implements DataSource, SQLExecutionMonito monitor = new SQLExecutionMonitor(this); } - protected abstract void configure(BaseDBConfiguration jdbcElem) throws DBConfigException; + protected abstract DataSource configure(BaseDBConfiguration jdbcElem) throws DBConfigException; /* * (non-Javadoc) @@ -329,7 +329,6 @@ public abstract class CachedDataSource implements DataSource, SQLExecutionMonito LOGGER.warn(e.getMessage()); } } - ds = null; monitor.deleteObservers(); monitor.cleanup(); } @@ -389,16 +388,6 @@ public abstract class CachedDataSource implements DataSource, SQLExecutionMonito return null; } - @SuppressWarnings("deprecation") - public void setConnectionCachingEnabled(boolean state) { - // if(ds != null && ds instanceof OracleDataSource) - // try { - // ((OracleDataSource)ds).setConnectionCachingEnabled(true); - // } catch (SQLException exc) { - // LOGGER.warn("", exc); - // } - } - public void addObserver(Observer observer) { monitor.addObserver(observer); } |