Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug in fragmentation 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384638 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2006-03-09 22:57:13 +00:00
parent 7b69145159
commit 3d7f76719f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandChannel.java
View File

@ -179,7 +179,6 @@ public class CommandChannel implements Service {
public void write(Command command, SocketAddress address) throws IOException { public void write(Command command, SocketAddress address) throws IOException {
synchronized (writeLock) { synchronized (writeLock) {
header.incrementCounter();
ByteArrayOutputStream largeBuffer = new ByteArrayOutputStream(largeMessageBufferSize); ByteArrayOutputStream largeBuffer = new ByteArrayOutputStream(largeMessageBufferSize);
wireFormat.marshal(command, new DataOutputStream(largeBuffer)); wireFormat.marshal(command, new DataOutputStream(largeBuffer));
@ -187,6 +186,7 @@ public class CommandChannel implements Service {
int size = data.length; int size = data.length;
if (size < datagramSize) { if (size < datagramSize) {
header.incrementCounter();
header.setPartial(false); header.setPartial(false);
header.setComplete(true); header.setComplete(true);
header.setDataSize(size); header.setDataSize(size);
@ -210,6 +210,10 @@ public class CommandChannel implements Service {
writeBuffer.rewind(); writeBuffer.rewind();
int chunkSize = writeBuffer.capacity() - headerMarshaller.getHeaderSize(header); int chunkSize = writeBuffer.capacity() - headerMarshaller.getHeaderSize(header);
lastFragment = offset + chunkSize >= length; lastFragment = offset + chunkSize >= length;
if (lastFragment) {
chunkSize = length - offset;
}
header.incrementCounter();
header.setDataSize(chunkSize); header.setDataSize(chunkSize);
header.setComplete(lastFragment); header.setComplete(lastFragment);
headerMarshaller.writeHeader(header, writeBuffer); headerMarshaller.writeHeader(header, writeBuffer);