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

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

Author: fnasser at redhat.com
Date: 2010-05-26 14:12:08 -0400 (Wed, 26 May 2010)
New Revision: 105268

Modified:
   branches/JBPAPP_5_0/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_0/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- branches/JBPAPP_5_0/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-26 18:11:23 UTC (rev 105267)
+++ branches/JBPAPP_5_0/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-26 18:12:08 UTC (rev 105268)
@@ -377,7 +377,8 @@
     */
    public void setUseTryLock(Integer useTryLock)
    {
-      this.useTryLock = useTryLock;
+      if( useTryLock != null)
+         this.useTryLock = useTryLock;
    }
    
    /**