[jboss-cvs] JBoss Messaging SVN: r3315 - projects/jbm-mina/tests/src/org/jboss/messaging/remoting.

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

Author: jmesnil
Date: 2007-11-13 03:32:52 -0500 (Tue, 13 Nov 2007)
New Revision: 3315

Modified:
   projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestServerHandler.java
   projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestSupport.java
Log:
* in TestServerHandler, send a NULL packet as a reply to a message if the server'transport is HTTP (instead of checking the default transport)

Modified: projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestServerHandler.java
===================================================================
--- projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestServerHandler.java	2007-11-12 16:34:02 UTC (rev 3314)
+++ projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestServerHandler.java	2007-11-13 08:32:52 UTC (rev 3315)
@@ -10,6 +10,7 @@
 
 import org.apache.mina.common.IoHandlerAdapter;
 import org.apache.mina.common.IoSession;
+import org.jboss.messaging.remoting.internal.TransportType;
 import org.jboss.messaging.remoting.wireformat.AbstractPacket;
 import org.jboss.messaging.remoting.wireformat.NullPacket;
 import org.jboss.messaging.remoting.wireformat.TextPacket;
@@ -19,7 +20,13 @@
    private List<AbstractPacket> packets = new ArrayList<AbstractPacket>();
    private long sleepTime = 0;
    private List<IoSession> sessions = new ArrayList<IoSession>();
+   private TransportType transport;
 
+   TestServerHandler(TransportType transport)
+   {
+      this.transport = transport;
+   }
+   
    public void setSleepTime(long sleepTime)
    {
       this.sleepTime = sleepTime;
@@ -32,7 +39,7 @@
 
       // TODO put this logic in the real server handler
       if (((AbstractPacket) msg).getCorrelationID() == NO_CORRELATION_ID
-            && TestSupport.TRANSPORT == HTTP)
+            && transport == HTTP)
       {
          session.write(new NullPacket());
       }

Modified: projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestSupport.java
===================================================================
--- projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestSupport.java	2007-11-12 16:34:02 UTC (rev 3314)
+++ projects/jbm-mina/tests/src/org/jboss/messaging/remoting/TestSupport.java	2007-11-13 08:32:52 UTC (rev 3315)
@@ -72,7 +72,7 @@
          throws Exception
    {
       serverAcceptor = new NioSocketAcceptor();
-      serverHandler = new TestServerHandler();
+      serverHandler = new TestServerHandler(transport);
 
       MdcInjectionFilter mdcInjectionFilter = new MdcInjectionFilter();
       serverAcceptor.getFilterChain().addLast("mdc", mdcInjectionFilter);