[jboss-cvs] JBossAS SVN: r76315 - in branches/Branch_4_2/connector/src: main/org/jboss/resource/adapter/jms and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-07-28 13:24:19 -0400 (Mon, 28 Jul 2008)
New Revision: 76315

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsManagedConnectionFactory.java
   branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd
Log:
[JBAS-5805] - Change the default use-try-lock to 60 seconds

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2008-07-28 17:03:35 UTC (rev 76314)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2008-07-28 17:24:19 UTC (rev 76315)
@@ -123,7 +123,7 @@
    private boolean validateOnMatch;
 
    /** Whether to use a try lock */
-   private int useTryLock = 0;
+   private int useTryLock = 60;
    
    public BaseWrapperManagedConnectionFactory ()
    {

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsManagedConnectionFactory.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsManagedConnectionFactory.java	2008-07-28 17:03:35 UTC (rev 76314)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsManagedConnectionFactory.java	2008-07-28 17:24:19 UTC (rev 76315)
@@ -59,7 +59,7 @@
    private JMSProviderAdapter adapter;
    
    /** The try lock */
-   private int useTryLock = 0;
+   private int useTryLock = 60;
 
    public JmsManagedConnectionFactory()
    {

Modified: branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd
===================================================================
--- branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd	2008-07-28 17:03:35 UTC (rev 76314)
+++ branches/Branch_4_2/connector/src/resources/dtd/jboss-ds_1_5.dtd	2008-07-28 17:24:19 UTC (rev 76315)
@@ -344,7 +344,7 @@
 
 <!-- Whether to use try locks in seconds
 
-     The default is wait for a lock indefinitely
+     The default is wait 60 seconds for a lock
      e.g. 5 minutes
      <use-try-lock>300</use-try-lock>
 -->