db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r620485 - /db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
Date Mon, 11 Feb 2008 13:53:34 GMT
Author: kristwaa
Date: Mon Feb 11 05:53:32 2008
New Revision: 620485

URL: http://svn.apache.org/viewvc?rev=620485&view=rev
Log:
DERBY-3309: Minor cleanups in ClientPooledConnection40 and ClientPooledConnection.
This patch fixes the broken synchronization of the list of connection event listeners, and
also replaces the Vector with an ArrayList.
Patch file: derby-3309-4a-cpc_listeners_synch.diff

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java?rev=620485&r1=620484&r2=620485&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java Mon
Feb 11 05:53:32 2008
@@ -22,6 +22,10 @@
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import javax.sql.ConnectionEvent;
+import javax.sql.ConnectionEventListener;
+import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.derby.client.net.NetXAConnection;
 import org.apache.derby.iapi.error.ExceptionSeverity;
 import org.apache.derby.jdbc.ClientBaseDataSource;
@@ -40,7 +44,8 @@
     /** Tells if this pooled connection is newly created. */
     private boolean newPC_ = true;
 
-    private java.util.Vector listeners_ = null;
+    //@GuardedBy("this")
+    private ArrayList listeners_ = null;
     org.apache.derby.client.am.Connection physicalConnection_ = null;
     org.apache.derby.client.net.NetConnection netPhysicalConnection_ = null;
     org.apache.derby.client.net.NetXAConnection netXAPhysicalConnection_ = null;
@@ -82,7 +87,7 @@
             ds_ = ds;
             user_ = user;
             password_ = password;
-            listeners_ = new java.util.Vector();
+            listeners_ = new ArrayList();
             
             //pass the client pooled connection instance to this
             //instance of the NetConnection object 
@@ -134,7 +139,7 @@
             user_ = user;
             password_ = password;
             rmId_ = rmId;
-            listeners_ = new java.util.Vector();
+            listeners_ = new ArrayList();
             netXAPhysicalConnection_ = getNetXAConnection(ds,
                     (NetLogWriter) logWriter_,
                     user,
@@ -268,18 +273,20 @@
                                                         this);
     }
 
-    public synchronized void addConnectionEventListener(javax.sql.ConnectionEventListener
listener) {
+    public synchronized void addConnectionEventListener(
+                                            ConnectionEventListener listener) {
         if (logWriter_ != null) {
             logWriter_.traceEntry(this, "addConnectionEventListener", listener);
         }
-        listeners_.addElement(listener);
+        listeners_.add(listener);
     }
 
-    public synchronized void removeConnectionEventListener(javax.sql.ConnectionEventListener
listener) {
+    public synchronized void removeConnectionEventListener(
+                                            ConnectionEventListener listener) {
         if (logWriter_ != null) {
             logWriter_.traceEntry(this, "removeConnectionEventListener", listener);
         }
-        listeners_.removeElement(listener);
+        listeners_.remove(listener);
     }
 
     /**
@@ -288,14 +295,15 @@
      * <p>
      * Not public, but needs to be visible to am.LogicalConnection
      */
-    public void recycleConnection() {
+    public synchronized void recycleConnection() {
         if (physicalConnection_.agent_.loggingEnabled()) {
             physicalConnection_.agent_.logWriter_.traceEntry(this, "recycleConnection");
         }
 
-        for (java.util.Enumeration e = listeners_.elements(); e.hasMoreElements();) {
-            javax.sql.ConnectionEventListener listener = (javax.sql.ConnectionEventListener)
e.nextElement();
-            javax.sql.ConnectionEvent event = new javax.sql.ConnectionEvent(this);
+        for (Iterator e = listeners_.iterator(); e.hasNext();) {
+            ConnectionEventListener listener =
+                    (ConnectionEventListener)e.next();
+            ConnectionEvent event = new ConnectionEvent(this);
             listener.connectionClosed(event);
         }
     }
@@ -313,11 +321,14 @@
 		if (exception.getErrorCode() < ExceptionSeverity.SESSION_SEVERITY)
 			return;
 
-        for (java.util.Enumeration e = listeners_.elements(); e.hasMoreElements();) {
-            javax.sql.ConnectionEventListener listener = (javax.sql.ConnectionEventListener)
e.nextElement();
-            java.sql.SQLException sqle = exception.getSQLException();
-            javax.sql.ConnectionEvent event = new javax.sql.ConnectionEvent(this, sqle);
-            listener.connectionErrorOccurred(event);
+        synchronized (this) {
+            for (Iterator e = listeners_.iterator(); e.hasNext();) {
+                ConnectionEventListener listener =
+                        (ConnectionEventListener)e.next();
+                SQLException sqle = exception.getSQLException();
+                ConnectionEvent event = new ConnectionEvent(this, sqle);
+                listener.connectionErrorOccurred(event);
+            }
         }
     }
 



Mime
View raw message