[hornetq-commits] JBoss hornetq SVN: r10018 - in trunk/src/main/org/hornetq/core: protocol/core/impl/wireformat and 1 other directory.

Author: clebert.suconic(a)jboss.com Date: 2010-12-08 14:26:11 -0500 (Wed, 08 Dec 2010) New Revision: 10018 Modified: trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageInternal.java trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java Log: tweaks and test fixes Modified: trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageImpl.java 2010-12-08 17:21:29 UTC (rev 10017) +++ trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageImpl.java 2010-12-08 19:26:11 UTC (rev 10018) @@ -39,7 +39,7 @@ // Used only when receiving large messages private LargeMessageController largeMessageController; - private int largeMessageSize; + private long largeMessageSize; // Static -------------------------------------------------------- @@ -48,7 +48,7 @@ /** * @return the largeMessageSize */ - public int getLargeMessageSize() + public long getLargeMessageSize() { return largeMessageSize; } @@ -56,7 +56,7 @@ /** * @param largeMessageSize the largeMessageSize to set */ - public void setLargeMessageSize(int largeMessageSize) + public void setLargeMessageSize(long largeMessageSize) { this.largeMessageSize = largeMessageSize; } @@ -184,8 +184,14 @@ { if (bodyBuffer == null) { - createBody(this.largeMessageSize + BODY_OFFSET); + long bodySize = this.largeMessageSize + BODY_OFFSET; + if (bodySize > Integer.MAX_VALUE) + { + bodySize = Integer.MAX_VALUE; + } + createBody((int)bodySize); + bodyBuffer = new ResetLimitWrappedHornetQBuffer(BODY_OFFSET, buffer, this); try @@ -217,7 +223,7 @@ @Override public void write(int b) throws IOException { - bufferOut.writeByte((byte)(b & Byte.MAX_VALUE)); + bufferOut.writeByte((byte)(b & 0xff)); } } Modified: trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageInternal.java 2010-12-08 17:21:29 UTC (rev 10017) +++ trunk/src/main/org/hornetq/core/client/impl/ClientLargeMessageInternal.java 2010-12-08 19:26:11 UTC (rev 10018) @@ -28,7 +28,7 @@ LargeMessageController getLargeMessageController(); - void setLargeMessageSize(int size); + void setLargeMessageSize(long size); - int getLargeMessageSize(); + long getLargeMessageSize(); } Modified: trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java 2010-12-08 17:21:29 UTC (rev 10017) +++ trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java 2010-12-08 19:26:11 UTC (rev 10018) @@ -15,6 +15,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.client.impl.ClientLargeMessageImpl; +import org.hornetq.core.client.impl.ClientLargeMessageInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageInternal; import org.hornetq.core.protocol.core.impl.PacketImpl; @@ -101,6 +102,7 @@ deliveryCount = buffer.readInt(); largeMessageSize = buffer.readLong(); message.decodeHeadersAndProperties(buffer); + ((ClientLargeMessageInternal)message).setLargeMessageSize(largeMessageSize); } }