[jboss-cvs] JBossAS SVN: r66841 - in branches/Branch_4_2/server/src/main/org/jboss: jms/asf and 1 other directory.

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

Author: bdecoste
Date: 2007-11-07 17:50:48 -0500 (Wed, 07 Nov 2007)
New Revision: 66841

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvokerMBean.java
   branches/Branch_4_2/server/src/main/org/jboss/jms/asf/StdServerSessionPool.java
Log:
[ASPATCH-240] merged changes from EAP branch for TIBCO EMS session recycle simulation and fix

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java	2007-11-07 22:50:44 UTC (rev 66840)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java	2007-11-07 22:50:48 UTC (rev 66841)
@@ -279,13 +279,12 @@
       return -1;
    }
    
-   public void setForceClearOnShutdown(boolean forceClear)
+   public void setForceClearOnShutdown(boolean forceClearOnShutdown)
    {
-      this.forceClearOnShutdown = forceClear;
-      
+      this.forceClearOnShutdown = forceClearOnShutdown;
    }   
    
-   public boolean isForceClearOnShutdown()
+   public boolean getForceClearOnShutdown()
    {
       return this.forceClearOnShutdown;
    }
@@ -441,9 +440,63 @@
       catch (Exception ignore)
       {
       }
+      
+      try
+      {
+         String maxSize = MetaData.getElementContent
+            (MetaData.getUniqueChild(element, "MaximumSize"));
+         maxPoolSize = Integer.parseInt(maxSize);
+      }
+      catch (Exception ignore)
+      {
+      }
 
       try
       {
+         String forceClear = MetaData.getElementContent(MetaData.getUniqueChild(element, "ForceClearOnShutdown"));
+         if(forceClear != null)
+         {
+            forceClearOnShutdown = ("false".equalsIgnoreCase(forceClear)) ? false : true;
+            
+         }
+         
+      }catch(Exception ignore)
+      {
+         
+      }
+
+      try
+      {
+         String clearInterval = MetaData.getElementContent(MetaData.getUniqueChild(element, "ForceClearInterval"));
+         
+         if(clearInterval != null)
+         {
+            forceClearInterval = new Long(clearInterval).longValue();
+            
+         }
+               
+      }catch(Exception ignore)
+      {
+         
+      }
+
+      try
+      {
+         String attempts = MetaData.getElementContent(MetaData.getUniqueChild(element, "ForceClearAttempts"));
+         
+         if(attempts != null)
+         {
+            forceClearAttempts = new Integer(attempts).intValue();
+            
+         }
+      
+      }catch(Exception ignore)
+      {
+         
+      }
+
+      try
+      {
          String maxSize = MetaData.getElementContent
             (MetaData.getUniqueChild(element, "MaximumSize"));
          maxPoolSize = Integer.parseInt(maxSize);

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvokerMBean.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvokerMBean.java	2007-11-07 22:50:44 UTC (rev 66840)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvokerMBean.java	2007-11-07 22:50:48 UTC (rev 66841)
@@ -78,7 +78,7 @@
     * 
     * @return
     */
-   boolean isForceClearOnShutdown();
+   boolean getForceClearOnShutdown();
    
    /**
     * FIXME Comment this

Modified: branches/Branch_4_2/server/src/main/org/jboss/jms/asf/StdServerSessionPool.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/jms/asf/StdServerSessionPool.java	2007-11-07 22:50:44 UTC (rev 66840)
+++ branches/Branch_4_2/server/src/main/org/jboss/jms/asf/StdServerSessionPool.java	2007-11-07 22:50:48 UTC (rev 66841)
@@ -269,7 +269,7 @@
       int attempts = 0;
       if(forceClear)
       {
-         log.trace("Force clear behavior in effect. Waiting for " + forceClearInterval + " milliseconds for " + forceClearAttempts + " attempts.");
+         log.info("Force clear behavior in effect. Waiting for " + forceClearInterval + " milliseconds for " + forceClearAttempts + " attempts.");
 
          while((numServerSessions > 0) && (attempts < forceClearAttempts))
          {
@@ -357,7 +357,7 @@
       }
    }
 
-   private void create() throws JMSException
+   protected void create() throws JMSException
    {
       for (int index = 0; index < poolSize; index++)
       {