[jboss-cvs] JBossAS SVN: r105053 - in trunk/connector/src: main/java/org/jboss/resource/metadata/mcf and 1 other directories.

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

Author: jesper.pedersen
Date: 2010-05-20 09:13:18 -0400 (Thu, 20 May 2010)
New Revision: 105053

Modified:
   trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
   trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
   trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
   trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd
   trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd
Log:
[JBAS-7071] use-try-lock is ignored

Modified: trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2010-05-20 12:13:55 UTC (rev 105052)
+++ trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2010-05-20 13:13:18 UTC (rev 105053)
@@ -255,7 +255,7 @@
 
    protected void tryLock() throws SQLException
    {
-      int tryLock = mcf.getUseTryLock();
+      int tryLock = mcf.getUseTryLock().intValue();
       if (tryLock <= 0)
       {
          lock();

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 12:13:55 UTC (rev 105052)
+++ trunk/connector/src/main/java/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2010-05-20 13:13:18 UTC (rev 105053)
@@ -144,7 +144,7 @@
    private boolean validateOnMatch = true;
 
    /** Whether to use a try lock */
-   private int useTryLock = 60;
+   private Integer useTryLock = Integer.valueOf(60);
 
    public BaseWrapperManagedConnectionFactory ()
    {
@@ -365,7 +365,7 @@
     * 
     * @return the useTryLock.
     */
-   public int getUseTryLock()
+   public Integer getUseTryLock()
    {
       return useTryLock;
    }
@@ -375,7 +375,7 @@
     * 
     * @param useTryLock the useTryLock.
     */
-   public void setUseTryLock(int useTryLock)
+   public void setUseTryLock(Integer useTryLock)
    {
       this.useTryLock = useTryLock;
    }

Modified: trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2010-05-20 12:13:55 UTC (rev 105052)
+++ trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2010-05-20 13:13:18 UTC (rev 105053)
@@ -96,7 +96,7 @@
    private int queryTimeout;
    
    @XmlElement(name="use-try-lock")
-   private long useTryLock;
+   private Integer useTryLock;
    
    @XmlElement(name="url-delimiter")
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@@ -267,12 +267,12 @@
 
    @ManagementProperty(name="use-try-lock", description="The internal lock timeout",
          includeInTemplate=true)
-   public long getUseTryLock()
+   public Integer getUseTryLock()
    {
       return useTryLock;
    }
 
-   public void setUseTryLock(long useTryLock)
+   public void setUseTryLock(Integer useTryLock)
    {
       this.useTryLock = useTryLock;
    }
@@ -429,7 +429,7 @@
       
       property = new ManagedConnectionFactoryPropertyMetaData();
       property.setName("UseTryLock");
-      property.setType("long");
+      property.setType("java.lang.Integer");
       property.setValue(String.valueOf(getUseTryLock()));
       properties.add(property);
       

Modified: trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd
===================================================================
--- trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd	2010-05-20 12:13:55 UTC (rev 105052)
+++ trunk/connector/src/resources/dtd/jboss-ds_1_5.dtd	2010-05-20 13:13:18 UTC (rev 105053)
@@ -362,11 +362,11 @@
 -->
 <!ELEMENT query-timeout (#PCDATA)>
 
-<!-- Any configured timeout for internal locks on the resource adapter objects in milli-seconds
+<!-- Any configured timeout for internal locks on the resource adapter objects in seconds
 
      The default is a 60 second timeout
      e.g. 5 minutes
-     <use-try-lock>300000</use-try-lock>
+     <use-try-lock>300</use-try-lock>
 -->
 <!ELEMENT use-try-lock (#PCDATA)>
 

Modified: trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd
===================================================================
--- trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd	2010-05-20 12:13:55 UTC (rev 105052)
+++ trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd	2010-05-20 13:13:18 UTC (rev 105053)
@@ -380,11 +380,11 @@
 -->
 <!ELEMENT query-timeout (#PCDATA)>
 
-<!-- Any configured timeout for internal locks on the resource adapter objects in milli-seconds
+<!-- Any configured timeout for internal locks on the resource adapter objects in seconds
 
      The default is a 60 second timeout
      e.g. 5 minutes
-     <use-try-lock>300000</use-try-lock>
+     <use-try-lock>300</use-try-lock>
 -->
 <!ELEMENT use-try-lock (#PCDATA)>