ozeigermann 2003/11/25 01:14:17
Modified: proposals/stores/org/apache/slide/store/impl/rdbms
JDBCStore.java
Log:
Preliminary adaptions for Oracle port
Revision Changes Path
1.2 +39 -20
jakarta-slide/proposals/stores/org/apache/slide/store/impl/rdbms/JDBCStore.java
Index: JDBCStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/stores/org/apache/slide/store/impl/rdbms/JDBCStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCStore.java 14 Nov 2003 12:28:27 -0000 1.1
+++ JDBCStore.java 25 Nov 2003 09:14:17 -0000 1.2
@@ -314,8 +314,16 @@
LOG_CHANNEL,
Logger.INFO);
- ConnectionFactory connectionFactory = new
DriverManagerConnectionFactory(url, user, password);
- new PoolableConnectionFactory(connectionFactory,
connectionPool, null, null, false, false);
+ DriverManagerConnectionFactory connectionFactory =
+ new DriverManagerConnectionFactory(url, user, password);
+ new PoolableConnectionFactory(
+ connectionFactory,
+ connectionPool,
+ null,
+ null,
+ false,
+ false,
+ isolationLevel);
PoolingDriver driver = new PoolingDriver();
driver.registerPool(DBCP_POOL_NAME, connectionPool);
// already done when loding PoolingDriver class
@@ -341,24 +349,35 @@
Connection connection;
if (useDbcpPooling) {
- connection = DriverManager.getConnection(DBCP_URL + ":" +
DBCP_POOL_NAME);
+ try {
+ connection = DriverManager.getConnection(DBCP_URL + ":" +
DBCP_POOL_NAME);
+ } catch (SQLException e) {
+ getLogger().log("Could not create connection. Reason: " + e,
LOG_CHANNEL, Logger.EMERGENCY);
+ throw e;
+ }
} else {
- connection = DriverManager.getConnection(url, user, password);
- }
+ try {
+ connection = DriverManager.getConnection(url, user, password);
+ } catch (SQLException e) {
+ getLogger().log("Could not create connection. Reason: " + e,
LOG_CHANNEL, Logger.EMERGENCY);
+ throw e;
+ }
- if (connection.getAutoCommit()) {
- connection.setAutoCommit(false);
- }
+ try {
+ if (connection.getTransactionIsolation() != isolationLevel) {
+ connection.setTransactionIsolation(isolationLevel);
+ }
+ } catch (SQLException e) {
+ getLogger().log(
+ "Could not set isolation level '" +
isolationLevelToString(isolationLevel) + "'. Reason: " + e,
+ LOG_CHANNEL,
+ Logger.WARNING);
+ }
- try {
- if (connection.getTransactionIsolation() != isolationLevel) {
- connection.setTransactionIsolation(isolationLevel);
+ if (connection.getAutoCommit()) {
+ connection.setAutoCommit(false);
}
- } catch (SQLException e) {
- getLogger().log(
- "Could not set isolation level '" +
isolationLevelToString(isolationLevel) + "'. Reason: " + e,
- LOG_CHANNEL,
- Logger.WARNING);
+
}
return connection;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
