[Jboss-cvs] JBoss Messaging SVN: r1211 - in trunk: src/main/org/jboss/jms/client/container tests/src/org/jboss/test/messaging/jms

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

Author: timfox
Date: 2006-08-08 05:07:46 -0400 (Tue, 08 Aug 2006)
New Revision: 1211

Modified:
   trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
   trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-496 plus remove illegal chars in SessionAspect



Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2006-08-08 04:30:11 UTC (rev 1210)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2006-08-08 09:07:46 UTC (rev 1211)
@@ -204,8 +204,8 @@
    /*
     * Redelivery occurs in two situations:
     * 1) When session.recover() is called (JMS1.1 4.4.11)
-    * "A session’s recover method is used to stop a session and restart it with its first
-    * unacknowledged message. In effect, the session’s series of delivered messages
+    * "A session's recover method is used to stop a session and restart it with its first
+    * unacknowledged message. In effect, the session's series of delivered messages
     * is reset to the point after its last acknowledged message."
     * An important note here is that session recovery is LOCAL to the session.
     * Session recovery DOES NOT result in delivered messages being cancelled back
@@ -216,8 +216,8 @@
     * On rollback of a session the spec is clear that session recovery occurs:
     * "If a transaction rollback is done, its produced messages
     * are destroyed and its consumed messages are automatically recovered. For
-    * more information on session recovery, see Section 4.4.11 ”Message
-    * Acknowledgment.”"
+    * more information on session recovery, see Section 4.4.11 'Message
+    * Acknowledgment.'"
     * So on rollback we do session recovery (local redelivery) in the same as if 
     * session.recover() was called.
     * 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2006-08-08 04:30:11 UTC (rev 1210)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2006-08-08 09:07:46 UTC (rev 1211)
@@ -154,19 +154,20 @@
       
       JBossConnectionFactory f1 = (JBossConnectionFactory)initialContext.lookup("/TestConnectionFactory1");            
       ClientConnectionFactoryDelegate del1 = (ClientConnectionFactoryDelegate)f1.getDelegate();      
-      assertTrue(del1.getServerLocatorURI().startsWith("socket://127.0.0.1:1234"));
       
+      assertTrue(del1.getServerLocatorURI().startsWith("socket://localhost:1234"));
+      
       JBossConnectionFactory f2 = (JBossConnectionFactory)initialContext.lookup("/TestConnectionFactory2");            
       ClientConnectionFactoryDelegate del2 = (ClientConnectionFactoryDelegate)f2.getDelegate();      
-      assertTrue(del2.getServerLocatorURI().startsWith("socket://127.0.0.1:1235"));
+      assertTrue(del2.getServerLocatorURI().startsWith("socket://localhost:1235"));
       
       JBossConnectionFactory f3 = (JBossConnectionFactory)initialContext.lookup("/TestConnectionFactory3");            
       ClientConnectionFactoryDelegate del3 = (ClientConnectionFactoryDelegate)f3.getDelegate();      
-      assertTrue(del3.getServerLocatorURI().startsWith("socket://127.0.0.1:1236"));
+      assertTrue(del3.getServerLocatorURI().startsWith("socket://localhost:1236"));
       
       JBossConnectionFactory f4 = (JBossConnectionFactory)initialContext.lookup("/TestConnectionFactory4");            
       ClientConnectionFactoryDelegate del4 = (ClientConnectionFactoryDelegate)f4.getDelegate();      
-      assertTrue(del4.getServerLocatorURI().startsWith("socket://127.0.0.1:1236"));
+      assertTrue(del4.getServerLocatorURI().startsWith("socket://localhost:1236"));
       
       Connection con1 = f1.createConnection();
       Connection con2 = f2.createConnection();