[jboss-cvs] JBossAS SVN: r108209 - in projects/jboss-jca/trunk: deployers/src/main/java/org/jboss/jca/deployers/fungal and 1 other directory.

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

Author: jesper.pedersen
Date: 2010-09-17 14:04:28 -0400 (Fri, 17 Sep 2010)
New Revision: 108209

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
Log:
[JBJCA-415] Fix data type for blocking timeout

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java	2010-09-17 17:41:03 UTC (rev 108208)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java	2010-09-17 18:04:28 UTC (rev 108209)
@@ -35,24 +35,25 @@
    /** Maximum size of the pool */
    private int maxSize;
 
-   /**Blocking timeout. In milliseconds*/
-   private int blockingTimeout;
+   /** Blocking timeout. In milliseconds */
+   private long blockingTimeout;
    
-   /**Idle timeout period. Default 30 mins. In milliseconds*/
+   /** Idle timeout period. Default 30 mins. In milliseconds */
    private long idleTimeout;
    
-   /**Background validation interval*/
+   /** Background validation interval */
    private long backgroundValidationInterval;
    
-   /**Prefill pool*/
+   /** Prefill pool*/
    private boolean prefill;
    
-   /**Strict minumum, default false*/
+   /** Strict minumum, default false */
    private boolean strictMin;
 
-   /**Do we want to immeadiately break when a connection cannot be matched and
-   *  not evaluate the rest of the pool? 
-   */
+   /** 
+    * Do we want to immeadiately break when a connection cannot be matched and
+    * not evaluate the rest of the pool? 
+    */
    private boolean useFastFail;
 
    /**
@@ -111,7 +112,7 @@
    /**
     * @return the blockingTimeout
     */
-   public int getBlockingTimeout()
+   public long getBlockingTimeout()
    {
       return blockingTimeout;
    }
@@ -119,7 +120,7 @@
    /**
     * @param blockingTimeout the blockingTimeout to set
     */
-   public void setBlockingTimeout(int blockingTimeout)
+   public void setBlockingTimeout(long blockingTimeout)
    {
       this.blockingTimeout = blockingTimeout;
    }

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java	2010-09-17 17:41:03 UTC (rev 108208)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractResourceAdapterDeployer.java	2010-09-17 18:04:28 UTC (rev 108209)
@@ -481,7 +481,7 @@
       if (tp != null)
       {
          if (tp.getBlockingTimeoutMillis() != null)
-            pc.setBlockingTimeout(tp.getBlockingTimeoutMillis().intValue()); // TODO - Long -> int
+            pc.setBlockingTimeout(tp.getBlockingTimeoutMillis().longValue());
 
          if (tp.getIdleTimeoutMinutes() != null)
             pc.setIdleTimeout(tp.getIdleTimeoutMinutes().longValue());
@@ -495,6 +495,7 @@
 
       if (vp != null)
       {
+         //if (vp.isUseFastFail() != null)
          pc.setUseFastFail(vp.isUseFastFail()); // TODO
       }
 

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java	2010-09-17 17:41:03 UTC (rev 108208)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java	2010-09-17 18:04:28 UTC (rev 108209)
@@ -388,7 +388,7 @@
 
       PoolConfiguration pc = createPoolConfiguration(minSize,
                                                      maxSize,
-                                                     blockingTimeout, // TODO
+                                                     blockingTimeout,
                                                      idleTimeout,
                                                      backgroundValidationInterval,
                                                      prefill,
@@ -468,7 +468,7 @@
 
       PoolConfiguration pc = createPoolConfiguration(minSize,
                                                      maxSize,
-                                                     blockingTimeout, // TODO
+                                                     blockingTimeout,
                                                      idleTimeout,
                                                      backgroundValidationInterval,
                                                      prefill,
@@ -557,7 +557,7 @@
          pc.setMaxSize(maxSize.intValue());
 
       if (blockingTimeout != null)
-         pc.setBlockingTimeout(blockingTimeout.intValue()); // TODO - Long -> int
+         pc.setBlockingTimeout(blockingTimeout.longValue());
 
       if (idleTimeout != null)
          pc.setIdleTimeout(idleTimeout.longValue());