Attachment 23521 Details for Bug 47061 – Patch JDBCStore to use datasource v2.

[patch] Patch JDBCStore to use datasource v2.

jdbcstore-datasource.patch (text/plain), 4.38 KB, created by Steve Pugh on 2009-04-21 07:48:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Pugh

Created: 2009-04-21 07:48:00 UTC

Size: 4.38 KB

patch

obsolete

>Index: JDBCStore.java
>===================================================================
>--- JDBCStore.java	(revision 766720)
>+++ JDBCStore.java	(working copy)
>@@ -38,6 +38,10 @@
> import java.sql.SQLException;
> import java.util.ArrayList;
> import java.util.Properties;
>+import javax.naming.Context;
>+import javax.naming.InitialContext;
>+import javax.naming.NamingException;
>+import javax.sql.DataSource;
> 
> /**
>  * Implementation of the <code>Store</code> interface that stores
>@@ -72,6 +76,11 @@
>     protected String threadName = "JDBCStore";
> 
>     /**
>+     * The connection datasource
>+     */
>+    protected String datasourceName = null;
>+
>+    /**
>      * The connection username to use when trying to connect to the database.
>      */
>     protected String connectionName = null;
>@@ -101,6 +110,11 @@
>      * Driver to use.
>      */
>     protected String driverName = null;
>+    
>+    /**
>+     * Data source to use.
>+     */
>+    protected DataSource datasource = null;
> 
>     // ------------------------------------------------------------- Table & cols
> 
>@@ -217,6 +231,23 @@
>     }
> 
>     /**
>+     * Return the datasource name to use to connect to the database.
>+     *
>+     */
>+    public String getDatasourceName() {
>+        return datasourceName;
>+    }
>+
>+    /**
>+     * Set the datasource name to use to connect to the database.
>+     *
>+     * @param datasourceName datasource name
>+     */
>+    public void setDatasourceName(String datasourceName) {
>+        this.datasourceName = datasourceName;
>+    }
>+
>+    /**
>      * Set the driver for this Store.
>      *
>      * @param driverName The new driver
>@@ -745,6 +776,11 @@
>         InputStream in = null;
> 
>         synchronized (this) {
>+            // If sessions already exist in DB, remove and insert again.
>+            // TODO:
>+            // * Check if ID exists in database and if so use UPDATE.
>+            remove(session.getIdInternal());
>+            
>             int numberOfTries = 2;
>             while (numberOfTries > 0) {
>                 Connection _conn = getConnection();
>@@ -752,11 +788,6 @@
>                     return;
>                 }
> 
>-                // If sessions already exist in DB, remove and insert again.
>-                // TODO:
>-                // * Check if ID exists in database and if so use UPDATE.
>-                remove(session.getIdInternal());
>-
>                 try {
>                     bos = new ByteArrayOutputStream();
>                     oos = new ObjectOutputStream(new BufferedOutputStream(bos));
>@@ -850,8 +881,50 @@
>      * @exception SQLException if a database error occurs
>      */
>     protected Connection open() throws SQLException {
>+        if (datasourceName == null) {
>+            dbConnection = openDirectConnection();
>+        } else {
>+            dbConnection = openJNDIConnection();
>+        }
>+        return dbConnection;
>+    }
> 
>+    /**
>+     * Open (if necessary) and return a database connection for use by
>+     * this Realm.
>+     *
>+     * @exception SQLException if a database error occurs
>+     */
>+    protected Connection openJNDIConnection() throws SQLException {
>+
>         // Do nothing if there is a database connection already open
>+        if (dbConnection != null && !dbConnection.isClosed())
>+            return (dbConnection);
>+
>+        try {
>+            Context initialContext = new InitialContext();
>+            if (datasource == null) {
>+                manager.getContainer().getLogger().info("Lookup datasource " + datasourceName);
>+                datasource = (DataSource)initialContext.lookup(datasourceName);
>+            }
>+            return datasource.getConnection();
>+        } catch (NamingException ex) { 
>+           throw new SQLException("Unable to get datasource " +
>+               datasourceName + " : " + ex.getMessage());
>+        }
>+
>+    }
>+
>+
>+    /**
>+     * Open (if necessary) and return a database connection for use by
>+     * this Realm.
>+     *
>+     * @exception SQLException if a database error occurs
>+     */
>+    protected Connection openDirectConnection() throws SQLException {
>+
>+        // Do nothing if there is a database connection already open
>         if (dbConnection != null)
>             return (dbConnection);
> 
>@@ -955,7 +1028,9 @@
>      * @param conn The connection to be released
>      */
>     protected void release(Connection conn) {
>-        ;
>+        if (datasourceName != null) {
>+            close(conn);
>+        }
>     }
> 
>     /**

Actions: View | Diff

Attachments on bug 47061: 23518 | 23521 | 23639 | 23640 | 23778