[jboss-cvs] JBossAS SVN: r109445 - projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2010-11-24 09:22:38 -0500 (Wed, 24 Nov 2010)
New Revision: 109445

Modified:
   projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java
   projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java
Log:
Only notify if somebody cares

Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java	2010-11-24 12:18:54 UTC (rev 109444)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java	2010-11-24 14:22:38 UTC (rev 109445)
@@ -429,19 +429,24 @@
       {
          handles.remove(handle);
       }
-      ConnectionEvent ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
-      ce.setConnectionHandle(handle);
 
       Collection<ConnectionEventListener> copy = null;
       synchronized (cels)
       {
-         copy = new ArrayList<ConnectionEventListener>(cels);
+         if (cels != null && cels.size() > 0)
+            copy = new ArrayList<ConnectionEventListener>(cels);
       }
 
-      for (Iterator<ConnectionEventListener> i = copy.iterator(); i.hasNext();)
+      if (copy != null)
       {
-         ConnectionEventListener cel = i.next();
-         cel.connectionClosed(ce);
+         ConnectionEvent ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+         ce.setConnectionHandle(handle);
+
+         for (Iterator<ConnectionEventListener> i = copy.iterator(); i.hasNext();)
+         {
+            ConnectionEventListener cel = i.next();
+            cel.connectionClosed(ce);
+         }
       }
    }
 

Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java	2010-11-24 12:18:54 UTC (rev 109444)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java	2010-11-24 14:22:38 UTC (rev 109445)
@@ -166,7 +166,7 @@
          {
             synchronized (this)
             {
-               if (statements != null)
+               if (statements != null && statements.size() > 0)
                {
                   for (Iterator<Map.Entry<WrappedStatement, Throwable>> i = statements.entrySet().iterator();
                        i.hasNext();)