[jboss-cvs] JBossAS SVN: r105426 - branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc.

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

Author: fnasser at redhat.com
Date: 2010-05-31 16:22:14 -0400 (Mon, 31 May 2010)
New Revision: 105426

Modified:
   branches/JBPAPP_5_1/connector/src/main/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 (smarlow at redhat.com)

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-31 20:18:39 UTC (rev 105425)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-31 20:22:14 UTC (rev 105426)
@@ -377,7 +377,8 @@
     */
    public void setUseTryLock(Integer useTryLock)
    {
-      this.useTryLock = useTryLock;
+      if( useTryLock != null)
+         this.useTryLock = useTryLock;
    }
    
    /**