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

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

Author: sergeypk
Date: 2007-06-18 12:55:50 -0400 (Mon, 18 Jun 2007)
New Revision: 2788

Modified:
   trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-993

Modified: trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java	2007-06-18 12:48:39 UTC (rev 2787)
+++ trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java	2007-06-18 16:55:50 UTC (rev 2788)
@@ -132,25 +132,11 @@
          
          if (destination.isQueue())
          {
-            if (destination.isTemporary())
-            {
-               jbDest = new JBossTemporaryQueue(destination.getName());
-            }
-            else
-            {
-               jbDest = new JBossQueue(destination.getName());
-            }
+            jbDest = new JBossQueue(destination.getName());
          }
          else
          {
-            if (destination.isTemporary())
-            {
-               jbDest = new JBossTemporaryTopic(destination.getName());
-            }
-            else
-            {
-               jbDest = new JBossTopic(destination.getName());
-            }
+            jbDest = new JBossTopic(destination.getName());
          }
          
          c.rebind(jndiNameInContext, jbDest);         

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-06-18 12:48:39 UTC (rev 2787)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-06-18 16:55:50 UTC (rev 2788)
@@ -537,6 +537,8 @@
             mDest = new ManagedQueue(dest.getName(), fullSize, pageSize, downCacheSize, clustered);
          }
          
+         mDest.setTemporary(true);
+         
          dm.registerDestination(mDest);
          
          if (dest.isQueue())

Modified: trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java	2007-06-18 12:48:39 UTC (rev 2787)
+++ trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java	2007-06-18 16:55:50 UTC (rev 2788)
@@ -32,6 +32,7 @@
 import javax.jms.TemporaryTopic;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 import org.jboss.test.messaging.MessagingTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;
@@ -146,7 +147,7 @@
       MessageProducer producer = producerSession.createProducer(tempQueue);
 
       MessageConsumer consumer = consumerSession.createConsumer(tempQueue);
-
+      
       connection.start();
 
       final String messageText = "This is a message";
@@ -319,7 +320,37 @@
       }
    }
 
+   public void testTemporaryTopicShouldNotBeInJNDI() throws Exception
+   {
+      TemporaryTopic tempTopic = producerSession.createTemporaryTopic();
+      String topicName = tempTopic.getTopicName();
+      
+      try
+      {
+         initialContext.lookup("/topic/" + topicName);
+         fail("The temporary queue should not be bound to JNDI");
+      }
+      catch (NamingException e)
+      {
+         // Expected
+      }
+   }
 
+   public void testTemporaryQueueShouldNotBeInJNDI() throws Exception
+   {
+      TemporaryQueue tempQueue = producerSession.createTemporaryQueue();
+      String queueName = tempQueue.getQueueName();
+      
+      try
+      {
+         initialContext.lookup("/queue/" + queueName);
+         fail("The temporary queue should not be bound to JNDI");
+      }
+      catch (NamingException e)
+      {
+         // Expected
+      }
+   }