[jboss-cvs] JBoss Messaging SVN: r2813 - in trunk: src/main/org/jboss/jms/server/endpoint and 1 other directories.

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

Author: timfox
Date: 2007-06-28 04:51:05 -0400 (Thu, 28 Jun 2007)
New Revision: 2813

Modified:
   trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java
Log:
Fixed some more tests


Modified: trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-06-28 08:31:32 UTC (rev 2812)
+++ trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-06-28 08:51:05 UTC (rev 2813)
@@ -186,38 +186,21 @@
          {
             ConnectionEndpoint sce = (ConnectionEndpoint)i.next();
 
-            //Close on own thread
-            
-            new Thread(new Closer(sce)).start();           
+            try
+            {
+      			log.debug("clearing up state for connection " + sce);
+               sce.closing();
+               sce.close();
+               log.debug("cleared up state for connection " + sce);
+            }
+            catch (JMSException e)
+            {
+               log.error("Failed to close connection", e);
+            }          
          }
       }
    }
    
-   class Closer implements Runnable
-   {
-   	private ConnectionEndpoint ce;
-   	
-   	Closer(ConnectionEndpoint ce)
-   	{
-   		this.ce = ce;
-   	}
-   	
-   	public void run()
-   	{
-   		try
-         {
-   			log.debug("clearing up state for connection " + ce);
-            ce.closing();
-            ce.close();
-            log.debug("cleared up state for connection " + ce);
-         }
-         catch (JMSException e)
-         {
-            log.error("Failed to close connection", e);
-         }
-   	}
-   }
-
    // ConnectionListener implementation ------------------------------------------------------------
 
    /**

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-06-28 08:31:32 UTC (rev 2812)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-06-28 08:51:05 UTC (rev 2813)
@@ -1426,6 +1426,8 @@
                   
                   postOffice.addBinding(new Binding(new JMSCondition(false, jmsDestination.getName()), queue), true);
   
+                  queue.activate();                  
+                  
                   if (!mDest.isTemporary())
                   {
 	                  createCounter = true;

Modified: trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java	2007-06-28 08:31:32 UTC (rev 2812)
+++ trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java	2007-06-28 08:51:05 UTC (rev 2813)
@@ -236,6 +236,9 @@
       TextMessage tm = s.createTextMessage("A red square message");
       tm.setStringProperty("color", "red");
       tm.setStringProperty("shape", "square");
+      
+      log.info("**Sending the message");
+      
       prod.send(tm);
 
       conn.start();