[jboss-cvs] JBossAS SVN: r105041 - trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc.

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

Author: jesper.pedersen
Date: 2010-05-20 05:50:49 -0400 (Thu, 20 May 2010)
New Revision: 105041

Modified:
   trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
Log:
[JBAS-3813] BaseWrapperManagedConnectionFactory.isStaleConnection creates new class instance every call

Modified: trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-20 09:42:30 UTC (rev 105040)
+++ trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-20 09:50:49 UTC (rev 105041)
@@ -588,36 +588,26 @@
 
    boolean isStaleConnection(SQLException e)
    {
-      boolean isStale = false;
+      if (staleConnectionChecker != null)
+         return staleConnectionChecker.isStaleConnection(e); 
       
-      if(staleConnectionChecker != null)
+      if (staleConnectionCheckerClassName != null)
       {
-      
-         isStale = staleConnectionChecker.isStaleConnection(e); 
-         
-      }
-      
-      if(staleConnectionCheckerClassName != null)
-      {
-         
          try
          {
-            
             ClassLoader cl = Thread.currentThread().getContextClassLoader();
             Class clazz = cl.loadClass(staleConnectionCheckerClassName);
             staleConnectionChecker = (StaleConnectionChecker)clazz.newInstance();
-            isStale = staleConnectionChecker.isStaleConnection(e);
-            
-         }catch (Exception ex2)
+            return staleConnectionChecker.isStaleConnection(e);
+         }
+         catch (Exception ex2)
          {
             log.warn("exception trying to create stale connection checker (disabling)" + staleConnectionCheckerClassName, ex2);
             staleConnectionChecker = new NullStaleConnectionChecker();
-         
          }
-      
       }
             
-      return isStale;
+      return false;
    }