[jboss-cvs] JBoss Messaging SVN: r5496 - in trunk/src/main/org/jboss/messaging/core: remoting/impl/wireformat and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2008-12-09 19:14:27 -0500 (Tue, 09 Dec 2008)
New Revision: 5496

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientFileMessageImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionSendMessage.java
Log:
small tweaks

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientFileMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientFileMessageImpl.java	2008-12-09 23:36:04 UTC (rev 5495)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientFileMessageImpl.java	2008-12-10 00:14:27 UTC (rev 5496)
@@ -31,7 +31,6 @@
 
 import org.jboss.messaging.core.client.ClientFileMessage;
 import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
 import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
 
 /**

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionSendMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionSendMessage.java	2008-12-09 23:36:04 UTC (rev 5495)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionSendMessage.java	2008-12-10 00:14:27 UTC (rev 5496)
@@ -206,6 +206,8 @@
          // TODO can be optimised
 
          serverMessage = new ServerMessageImpl();
+         
+         clientMessage = serverMessage;
 
          serverMessage.decode(buffer);
 
@@ -231,19 +233,12 @@
                 DataConstants.SIZE_BOOLEAN + (largeMessageId >= 0 ? DataConstants.SIZE_LONG : 0) + 
                 DataConstants.SIZE_BOOLEAN;
       }
-      //FIXME - why duplicate this?
-      else if (clientMessage != null)
+      else
       {
          return DataConstants.SIZE_BOOLEAN + BASIC_PACKET_SIZE +
                 clientMessage.getEncodeSize() +
                 DataConstants.SIZE_BOOLEAN;
       }
-      else
-      {
-         return DataConstants.SIZE_BOOLEAN + BASIC_PACKET_SIZE +
-                serverMessage.getEncodeSize() +
-                DataConstants.SIZE_BOOLEAN;
-      }
    }
 
    // Package protected ---------------------------------------------