git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now also closing connection pool
[utils]
/
test
/
enterprise
/
src
/
main
/
java
/
org
/
wamblee
/
support
/
persistence
/
AbstractDatabase.java
diff --git
a/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java
b/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java
index 0fc871f1d4b9a6a2700a1fc22aee5580b8408fa2..2e8f8d8335e0070530bd9c042f8e699181429a97 100644
(file)
--- a/
test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java
+++ b/
test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java
@@
-12,9
+12,12
@@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.wamblee.support.persistence;
package org.wamblee.support.persistence;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.sql.DataSource;
import org.apache.commons.dbcp.ConnectionFactory;
import javax.sql.DataSource;
import org.apache.commons.dbcp.ConnectionFactory;
@@
-24,10
+27,16
@@
import org.apache.commons.dbcp.PoolingDataSource;
import org.apache.commons.pool.impl.GenericObjectPool;
public abstract class AbstractDatabase implements Database {
import org.apache.commons.pool.impl.GenericObjectPool;
public abstract class AbstractDatabase implements Database {
+
+ private static final Logger LOGGER = Logger
+ .getLogger(AbstractDatabase.class.getName());
+
private static final int CONNECTION_POOL_SIZE = 16;
private DataSource itsDataSource;
private static final int CONNECTION_POOL_SIZE = 16;
private DataSource itsDataSource;
+ private GenericObjectPool connectionPool;
+
private boolean started;
protected AbstractDatabase() {
private boolean started;
protected AbstractDatabase() {
@@
-42,7
+51,7
@@
public abstract class AbstractDatabase implements Database {
* This method must be called from the start method.
*/
protected final void createDataSource() {
* This method must be called from the start method.
*/
protected final void createDataSource() {
-
GenericObjectPool
connectionPool = new GenericObjectPool(null);
+ connectionPool = new GenericObjectPool(null);
connectionPool.setMaxActive(CONNECTION_POOL_SIZE);
ConnectionFactory connectionFactory = new DriverManagerConnectionFactory(
getJdbcUrl(), getUsername(), getPassword());
connectionPool.setMaxActive(CONNECTION_POOL_SIZE);
ConnectionFactory connectionFactory = new DriverManagerConnectionFactory(
getJdbcUrl(), getUsername(), getPassword());
@@
-54,7
+63,7
@@
public abstract class AbstractDatabase implements Database {
ingoredVariable(poolableConnectionFactory);
itsDataSource = new PoolingDataSource(connectionPool);
}
ingoredVariable(poolableConnectionFactory);
itsDataSource = new PoolingDataSource(connectionPool);
}
-
+
private static void ingoredVariable(PoolableConnectionFactory aFactory) {
// Empty
}
private static void ingoredVariable(PoolableConnectionFactory aFactory) {
// Empty
}
@@
-75,6
+84,12
@@
public abstract class AbstractDatabase implements Database {
return; // nothing to do.
}
started = false;
return; // nothing to do.
}
started = false;
+ try {
+ connectionPool.close();
+ connectionPool.close();
+ } catch (Exception e) {
+ LOGGER.log(Level.WARNING, "Could not close pool", e);
+ }
doStop();
}
doStop();
}