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

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

Author: smarlow at redhat.com
Date: 2010-05-21 12:28:27 -0400 (Fri, 21 May 2010)
New Revision: 105102

Modified:
   trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
Log:
JBAS-7071 TryLock support change isn't complete as we got a NPE on hudson.   Attempting to fix by ignoring null

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-21 15:28:34 UTC (rev 105101)
+++ trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-21 16:28:27 UTC (rev 105102)
@@ -377,7 +377,8 @@
     */
    public void setUseTryLock(Integer useTryLock)
    {
-      this.useTryLock = useTryLock;
+      if( useTryLock != null)
+         this.useTryLock = useTryLock;
    }
    
    /**