[jboss-cvs] JBoss Messaging SVN: r3558 - in trunk: src/main/org/jboss/messaging/core/remoting/impl and 3 other directories.

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

Author: jmesnil
Date: 2008-01-11 09:36:03 -0500 (Fri, 11 Jan 2008)
New Revision: 3558

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/ClientImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java
   trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java
Log:
* changed return type of NIOSession.getID() from long to String

Modified: trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java	2008-01-11 10:50:35 UTC (rev 3557)
+++ trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java	2008-01-11 14:36:03 UTC (rev 3558)
@@ -19,7 +19,7 @@
 public interface NIOSession
 {
 
-   long getID();
+   String getID();
 
    void write(Object object);
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ClientImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ClientImpl.java	2008-01-11 10:50:35 UTC (rev 3557)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ClientImpl.java	2008-01-11 14:36:03 UTC (rev 3558)
@@ -96,7 +96,7 @@
       {
          return null;
       }
-      return Long.toString(session.getID());
+      return session.getID();
    }
 
    /* (non-Javadoc)

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java	2008-01-11 10:50:35 UTC (rev 3557)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java	2008-01-11 14:36:03 UTC (rev 3558)
@@ -6,6 +6,8 @@
  */
 package org.jboss.messaging.core.remoting.impl.invm;
 
+import static java.util.UUID.randomUUID;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -30,7 +32,7 @@
 
    // Attributes ----------------------------------------------------
 
-   private long id;
+   private String id;
    private ExecutorService executor;
    private long correlationCounter;
 
@@ -40,8 +42,7 @@
 
    public INVMSession()
    {
-      // FIXME have a real ID
-      this.id = System.currentTimeMillis();
+      this.id = randomUUID().toString();
       this.executor = Executors.newSingleThreadExecutor();
       this.correlationCounter = 0;
    }
@@ -58,7 +59,7 @@
 
    // NIOSession implementation -------------------------------------
 
-   public long getID()
+   public String getID()
    {
       return id;
    }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java	2008-01-11 10:50:35 UTC (rev 3557)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java	2008-01-11 14:36:03 UTC (rev 3558)
@@ -44,9 +44,9 @@
 
    // Public --------------------------------------------------------
 
-   public long getID()
+   public String getID()
    {
-      return session.getId();
+      return Long.toString(session.getId());
    }
 
    public void write(Object object)

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java	2008-01-11 10:50:35 UTC (rev 3557)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java	2008-01-11 14:36:03 UTC (rev 3558)
@@ -6,6 +6,7 @@
  */
 package org.jboss.messaging.core.remoting.test.unit;
 
+import static java.util.UUID.randomUUID;
 import static org.easymock.EasyMock.createStrictMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
@@ -95,7 +96,7 @@
 
    public void testSessionID() throws Exception
    {
-      long sessionID = System.currentTimeMillis();
+      String sessionID = randomUUID().toString();
       
       NIOConnector connector = createStrictMock(NIOConnector.class);
       NIOSession session = createStrictMock(NIOSession.class);
@@ -114,7 +115,7 @@
       String actualSessionID = client.getSessionID();
       
       assertNotNull(actualSessionID);
-      assertEquals(Long.toString(sessionID), actualSessionID);
+      assertEquals(sessionID, actualSessionID);
       client.disconnect();
       assertNull(client.getSessionID());