[jboss-cvs] JBoss Messaging SVN: r3576 - in trunk: src/main/org/jboss/messaging/core/remoting/codec and 2 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2008-01-16 12:19:16 -0500 (Wed, 16 Jan 2008)
New Revision: 3576

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
   trunk/src/main/org/jboss/messaging/core/remoting/codec/CreateSessionResponseCodec.java
   trunk/src/main/org/jboss/messaging/core/remoting/wireformat/CreateSessionResponse.java
   trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java
Log:
Removing isStrictTCK from CreateSessionResponse

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2008-01-16 12:59:36 UTC (rev 3575)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2008-01-16 17:19:16 UTC (rev 3576)
@@ -807,8 +807,7 @@
                      request.isXA());
 
                response = new CreateSessionResponse(sessionDelegate.getID(),
-                     sessionDelegate.getDupsOKBatchSize(), sessionDelegate
-                           .isStrictTck());
+                     sessionDelegate.getDupsOKBatchSize());
             } else if (type == MSG_STARTCONNECTION)
             {
                start();

Modified: trunk/src/main/org/jboss/messaging/core/remoting/codec/CreateSessionResponseCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/codec/CreateSessionResponseCodec.java	2008-01-16 12:59:36 UTC (rev 3575)
+++ trunk/src/main/org/jboss/messaging/core/remoting/codec/CreateSessionResponseCodec.java	2008-01-16 17:19:16 UTC (rev 3576)
@@ -37,14 +37,12 @@
    {
       String sessionID = response.getSessionID();
       int dupsOKBatchSize = response.getDupsOKBatchSize();
-      boolean strictTCK = response.isStrictTCK();
 
-      int bodyLength = sizeof(sessionID) + INT_LENGTH + 1;
+      int bodyLength = sizeof(sessionID) + INT_LENGTH;
 
       out.putInt(bodyLength);
       out.putNullableString(sessionID);
       out.putInt(dupsOKBatchSize);
-      out.putBoolean(strictTCK);
    }
 
    @Override
@@ -59,9 +57,8 @@
 
       String sessionID = in.getNullableString();
       int dupsOKBatchSize = in.getInt();
-      boolean strictTCK = in.getBoolean();
 
-      return new CreateSessionResponse(sessionID, dupsOKBatchSize, strictTCK);
+      return new CreateSessionResponse(sessionID, dupsOKBatchSize);
    }
 
    // Package protected ---------------------------------------------

Modified: trunk/src/main/org/jboss/messaging/core/remoting/wireformat/CreateSessionResponse.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/wireformat/CreateSessionResponse.java	2008-01-16 12:59:36 UTC (rev 3575)
+++ trunk/src/main/org/jboss/messaging/core/remoting/wireformat/CreateSessionResponse.java	2008-01-16 17:19:16 UTC (rev 3576)
@@ -24,14 +24,11 @@
 
    private final int dupsOKBatchSize;
 
-   private final boolean strictTCK;
-
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
 
-   public CreateSessionResponse(String sessionID, int dupsOKBatchSize,
-         boolean strictTCK)
+   public CreateSessionResponse(String sessionID, int dupsOKBatchSize)
    {
       super(PacketType.RESP_CREATESESSION);
 
@@ -39,7 +36,6 @@
 
       this.sessionID = sessionID;
       this.dupsOKBatchSize = dupsOKBatchSize;
-      this.strictTCK = strictTCK;
    }
 
    // Public --------------------------------------------------------
@@ -54,17 +50,11 @@
       return dupsOKBatchSize;
    }
 
-   public boolean isStrictTCK()
-   {
-      return strictTCK;
-   }
-
    @Override
    public String toString()
    {
       return getParentString() + ", sessionID=" + sessionID
-            + ", dupsOKBatchSize=" + dupsOKBatchSize + ", strictTCK="
-            + strictTCK + "]";
+            + ", dupsOKBatchSize=" + dupsOKBatchSize + "]";
    }
 
    // Package protected ---------------------------------------------

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java	2008-01-16 12:59:36 UTC (rev 3575)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java	2008-01-16 17:19:16 UTC (rev 3576)
@@ -574,13 +574,13 @@
    public void testCreateSessionResponse() throws Exception
    {
       CreateSessionResponse response = new CreateSessionResponse(
-            randomString(), 23, false);
+            randomString(), 23);
       addVersion(response);
       
       AbstractPacketCodec codec = new CreateSessionResponseCodec();
       SimpleRemotingBuffer buffer = encode(response, codec);
       checkHeader(buffer, response);
-      checkBody(buffer, response.getSessionID(), response.getDupsOKBatchSize(), response.isStrictTCK());
+      checkBody(buffer, response.getSessionID(), response.getDupsOKBatchSize());
       buffer.rewind();
 
       AbstractPacket decodedPacket = codec.decode(buffer);
@@ -591,7 +591,6 @@
       assertEquals(response.getSessionID(), decodedResponse.getSessionID());
       assertEquals(response.getDupsOKBatchSize(), decodedResponse
             .getDupsOKBatchSize());
-      assertEquals(response.isStrictTCK(), decodedResponse.isStrictTCK());
    }
 
    public void testSendMessage() throws Exception