[jboss-cvs] JBossAS SVN: r66840 - branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow.

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

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

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSessionPool.java
Log:
[ASPATCH-240] merged changes from EAP branch for TIBCO EMS session recycle simulation and fix

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSessionPool.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSessionPool.java	2007-11-07 22:50:39 UTC (rev 66839)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSessionPool.java	2007-11-07 22:50:44 UTC (rev 66840)
@@ -222,15 +222,41 @@
          sessionCount -= serverSessions.size();
          serverSessions.clear();
 
-         // Wait for inuse sessions
-         while (sessionCount > 0)
-         {
-            try
+         if (activation.getActivationSpec().isForceClearOnShutdown())
+         {        
+            int attempts = 0;
+            int forceClearAttempts = activation.getActivationSpec().getForceClearAttempts();
+            long forceClearInterval = activation.getActivationSpec().getForceClearOnShutdownInterval();
+            
+            log.info("Force clear behavior in effect. Waiting for " + forceClearInterval + " milliseconds for " + forceClearAttempts + " attempts.");
+           
+            while((sessionCount > 0) && (attempts < forceClearAttempts))
             {
-               serverSessions.wait();
+               try
+               {
+                  serverSessions.wait(forceClearInterval);
+                  log.trace("Clear attempt " + attempts); 
+                  ++attempts;               
+            
+               }catch(InterruptedException ignore)
+               {
+                  
+               }
+            
             }
-            catch (InterruptedException ignore)
+         }
+         else
+         {
+            // Wait for inuse sessions
+            while (sessionCount > 0)
             {
+               try
+               {
+                  serverSessions.wait();
+               }
+               catch (InterruptedException ignore)
+               {
+               }
             }
          }
       }