[jboss-cvs] JBossAS SVN: r61055 - branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager.

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

Author: weston.price at jboss.com
Date: 2007-03-02 11:33:11 -0500 (Fri, 02 Mar 2007)
New Revision: 61055

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
Log:
[JBAS-4170] Fixed incorrect resource usage in background validation
check.

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2007-03-02 16:32:27 UTC (rev 61054)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2007-03-02 16:33:11 UTC (rev 61055)
@@ -636,9 +636,7 @@
                {
                   if (cls.size() == 0)
                   {
-
                      break;
-
                   }
 
                   cl = removeForFrequencyCheck();
@@ -647,7 +645,6 @@
 
                if (cl == null)
                {
-
                   break;
                }
 
@@ -666,10 +663,8 @@
 
                         if (cl.getState() != ConnectionListener.DESTROY)
                         {
-                           log.warn("");
                            doDestroy(cl);
                            destroyed = true;
-
                         }
                      }
 
@@ -682,11 +677,12 @@
                }
                finally
                {
-                  synchronized (cls)
+                  if(!destroyed)
                   {
-
-                     returnForFrequencyCheck(cl);
-
+                     synchronized (cls)
+                     {
+                        returnForFrequencyCheck(cl);
+                     }                     
                   }
 
                }