[jboss-cvs] JBoss Messaging SVN: r4725 - in branches/Branch_Message_Chunking: src/main/org/jboss/messaging/core/remoting/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 24 11:43:36 EDT 2008
Author: ataylor
Date: 2008-07-24 11:43:36 -0400 (Thu, 24 Jul 2008)
New Revision: 4725
Modified:
branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/PacketFragment.java
branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentBufferImpl.java
branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentImpl.java
branches/Branch_Message_Chunking/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/PacketFragmentBufferImplTest.java
Log:
cleaned up
Modified: branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/PacketFragment.java
===================================================================
--- branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/PacketFragment.java 2008-07-24 13:18:12 UTC (rev 4724)
+++ branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/PacketFragment.java 2008-07-24 15:43:36 UTC (rev 4725)
@@ -15,20 +15,8 @@
boolean isLastPacket();
- int getDataStartPosition();
-
- void setDataStartPosition(int dataStartPosition);
-
int getEndPosition();
- void reset();
-
- void setPacketId(int packetId);
-
- void setCorrelationId(int correlationId);
-
- void setLastPacket(boolean lastPacket);
-
boolean checkSpace(int size);
boolean hasReadSpace(int size);
Modified: branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentBufferImpl.java
===================================================================
--- branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentBufferImpl.java 2008-07-24 13:18:12 UTC (rev 4724)
+++ branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentBufferImpl.java 2008-07-24 15:43:36 UTC (rev 4725)
@@ -21,18 +21,16 @@
*/
package org.jboss.messaging.core.remoting.impl;
-import org.jboss.messaging.util.SimpleString;
-import org.jboss.messaging.util.MessagingBuffer;
-import static org.jboss.messaging.util.DataConstants.NULL;
-import static org.jboss.messaging.util.DataConstants.NOT_NULL;
-import static org.jboss.messaging.util.DataConstants.*;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketFragmentBuffer;
import org.jboss.messaging.core.remoting.PacketFragment;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketFragmentBuffer;
+import static org.jboss.messaging.util.DataConstants.*;
+import org.jboss.messaging.util.MessagingBuffer;
+import org.jboss.messaging.util.SimpleString;
-import java.util.List;
-import java.util.ArrayList;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
/**
* A MessagingBuffer that can be used to break up the buffers into smaller pieces.
@@ -67,7 +65,6 @@
this.packetFragments = packetFragments;
currentPos = 0;
this.packetFragmentSize = packetFragmentSize;
- getCurrentFragment().reset();
}
public void putFloat(float val)
@@ -163,7 +160,7 @@
}
}
}
- position += (i1 - i);
+ position += i1;
}
public void putBytes(byte[] bytes)
@@ -420,14 +417,13 @@
int read = 0;
while (read < size)
{
- left = getCurrentFragment().remaining();
+ left = getCurrentFragment().remaining() <= (size - read)? getCurrentFragment().remaining():size - read;
getCurrentFragment().getBytes(data, read, left);
read += left;
if(read < size)
{
currentPos++;
- getCurrentFragment().reset();
}
}
Modified: branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentImpl.java
===================================================================
--- branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentImpl.java 2008-07-24 13:18:12 UTC (rev 4724)
+++ branches/Branch_Message_Chunking/src/main/org/jboss/messaging/core/remoting/impl/PacketFragmentImpl.java 2008-07-24 15:43:36 UTC (rev 4725)
@@ -21,10 +21,10 @@
*/
package org.jboss.messaging.core.remoting.impl;
-import org.jboss.messaging.util.MessagingBuffer;
-import static org.jboss.messaging.util.DataConstants.*;
-import org.jboss.messaging.core.remoting.PacketFragment;
import org.jboss.messaging.core.remoting.MessageCache;
+import org.jboss.messaging.core.remoting.PacketFragment;
+import static org.jboss.messaging.util.DataConstants.*;
+import org.jboss.messaging.util.MessagingBuffer;
/**
* A fragment of a full packet that holds a portion of a full message within a buffer.
@@ -41,6 +41,7 @@
private int dataStartPosition = -1;
private MessagingBuffer messagingBuffer;
private MessageCache messageCache;
+ private static final int HEADER_SIZE = (SIZE_INT * 3) + SIZE_BOOLEAN;
public PacketFragmentImpl(int packetId, boolean lastPacket, int correlationId, int length, MessageCache messageCache, long id)
{
@@ -48,7 +49,7 @@
this.lastPacket = lastPacket;
this.correlationId = correlationId;
this.messageCache = messageCache;
- this.bodyLength = length - getHeaderSize();
+ this.bodyLength = length - HEADER_SIZE;
this.sessionId = id;
dataStartPosition = 0;
}
@@ -58,7 +59,7 @@
this.packetId = packetId;
this.lastPacket = lastPacket;
this.correlationId = correlationId;
- this.bodyLength = length - getHeaderSize();
+ this.bodyLength = length - HEADER_SIZE;
this.messagingBuffer = messagingBuffer;
dataStartPosition = messagingBuffer.position();
}
@@ -76,30 +77,11 @@
dataStartPosition = messagingBuffer.position();
}
- private int getHeaderSize()
- {
- return (SIZE_INT * 3) + SIZE_BOOLEAN;
- }
public int getPacketId()
{
return packetId;
}
- public void setPacketId(int packetId)
- {
- this.packetId = packetId;
- }
-
- public void setCorrelationId(int correlationId)
- {
- this.correlationId = correlationId;
- }
-
- public void setLastPacket(boolean lastPacket)
- {
- this.lastPacket = lastPacket;
- }
-
public int getCorrelationId()
{
return correlationId;
@@ -107,7 +89,7 @@
public int getLength()
{
- return bodyLength + getHeaderSize();
+ return bodyLength + HEADER_SIZE;
}
public boolean isLastPacket()
@@ -124,146 +106,129 @@
return messagingBuffer;
}
- public int getDataStartPosition()
- {
- return dataStartPosition;
- }
-
- public void setDataStartPosition(int dataStartPosition)
- {
- this.dataStartPosition = dataStartPosition;
- }
-
public int getEndPosition()
{
- return getDataStartPosition() + getLength() - getHeaderSize();
+ return dataStartPosition + getLength() - HEADER_SIZE;
}
- public void reset()
- {
- if(messagingBuffer != null)
- {
- messagingBuffer.position(dataStartPosition);
- }
- }
public boolean checkSpace(int size)
{
- int left = messagingBuffer.limit() - messagingBuffer.position();
+ int left = getMessagingBuffer().limit() - getMessagingBuffer().position();
return size<=left;
}
public boolean hasReadSpace(int size)
{
- return messagingBuffer.position() + size <= messagingBuffer.limit();
+ return getMessagingBuffer().position() + size <= getMessagingBuffer().limit();
}
public void putFloat(float val)
{
- messagingBuffer.putFloat(val);
+ getMessagingBuffer().putFloat(val);
bodyLength += SIZE_FLOAT;
}
public void putInt(int i)
{
- messagingBuffer.putInt(i);
+ getMessagingBuffer().putInt(i);
bodyLength += SIZE_INT;
}
public void putByte(byte b)
{
- messagingBuffer.putByte(b);
+ getMessagingBuffer().putByte(b);
bodyLength += SIZE_BYTE;
}
public void putLong(long l)
{
- messagingBuffer.putLong(l);
+ getMessagingBuffer().putLong(l);
bodyLength += SIZE_LONG;
}
public void putBytes(byte[] bytes, int i, int i1)
{
- messagingBuffer.putBytes(bytes, i, i1);
- bodyLength += (i1 - i);
+ getMessagingBuffer().putBytes(bytes, i, i1);
+ bodyLength += i1;
}
public void putDouble(double val)
{
- messagingBuffer.putDouble(val);
+ getMessagingBuffer().putDouble(val);
bodyLength += SIZE_DOUBLE;
}
public void putShort(short val)
{
- messagingBuffer.putShort(val);
+ getMessagingBuffer().putShort(val);
bodyLength += SIZE_SHORT;
}
public void putChar(char val)
{
- messagingBuffer.putChar(val);
+ getMessagingBuffer().putChar(val);
bodyLength += SIZE_CHAR;
}
public void putBoolean(boolean b)
{
- messagingBuffer.putBoolean(b);
+ getMessagingBuffer().putBoolean(b);
bodyLength += SIZE_BOOLEAN;
}
public int getInt()
{
- return messagingBuffer.getInt();
+ return getMessagingBuffer().getInt();
}
public long getLong()
{
- return messagingBuffer.getLong();
+ return getMessagingBuffer().getLong();
}
public short getShort()
{
- return messagingBuffer.getShort();
+ return getMessagingBuffer().getShort();
}
public boolean getBoolean()
{
- return messagingBuffer.getBoolean();
+ return getMessagingBuffer().getBoolean();
}
public byte getByte()
{
- return messagingBuffer.getByte();
+ return getMessagingBuffer().getByte();
}
public void getBytes(byte[] data)
{
- messagingBuffer.getBytes(data);
+ getMessagingBuffer().getBytes(data);
}
public void getBytes(byte[] data, int read, int left)
{
- messagingBuffer.getBytes(data, read, left);
+ getMessagingBuffer().getBytes(data, read, left);
}
public float getFloat()
{
- return messagingBuffer.getFloat();
+ return getMessagingBuffer().getFloat();
}
public double getDouble()
{
- return messagingBuffer.getDouble();
+ return getMessagingBuffer().getDouble();
}
public char getChar()
{
- return messagingBuffer.getChar();
+ return getMessagingBuffer().getChar();
}
public short getUnsignedByte()
{
- return messagingBuffer.getUnsignedByte();
+ return getMessagingBuffer().getUnsignedByte();
}
public int getBodyLength()
@@ -278,53 +243,53 @@
public int remaining()
{
- return messagingBuffer.remaining();
+ return getMessagingBuffer().remaining();
}
public int limit()
{
- return messagingBuffer.limit() - getHeaderSize();
+ return getMessagingBuffer().limit() - HEADER_SIZE;
}
public void writeHeaders()
{
- messagingBuffer.putInt(0, getLength() - SIZE_INT);
+ getMessagingBuffer().putInt(0, getLength() - SIZE_INT);
//we initially wrote true anyway
if(!isLastPacket())
{
- messagingBuffer.putBoolean(SIZE_INT, isLastPacket());
+ getMessagingBuffer().putBoolean(SIZE_INT, isLastPacket());
}
}
public PacketFragment createNextPacketFragment(int packetFragmentSize)
{
- setLastPacket(false);
+ lastPacket = false;
return new PacketFragmentImpl(packetId, correlationId + 1,
- messagingBuffer.createNewBuffer(packetFragmentSize));
+ getMessagingBuffer().createNewBuffer(packetFragmentSize));
}
public void putBoolean(int pos, boolean val)
{
- messagingBuffer.putBoolean(pos + getHeaderSize(), val);
+ getMessagingBuffer().putBoolean(pos + HEADER_SIZE, val);
}
public void putInt(int pos, int val)
{
- messagingBuffer.putInt(pos + getHeaderSize(), val);
+ getMessagingBuffer().putInt(pos + HEADER_SIZE, val);
}
public void rewind()
{
- messagingBuffer.rewind();
+ getMessagingBuffer().rewind();
}
public void flip()
{
- messagingBuffer.flip();
+ getMessagingBuffer().flip();
}
public void position(int position)
{
- messagingBuffer.position(position);
+ getMessagingBuffer().position(position);
}
}
Modified: branches/Branch_Message_Chunking/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/PacketFragmentBufferImplTest.java
===================================================================
--- branches/Branch_Message_Chunking/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/PacketFragmentBufferImplTest.java 2008-07-24 13:18:12 UTC (rev 4724)
+++ branches/Branch_Message_Chunking/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/PacketFragmentBufferImplTest.java 2008-07-24 15:43:36 UTC (rev 4725)
@@ -21,14 +21,14 @@
*/
package org.jboss.messaging.tests.unit.core.remoting.impl;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.tests.util.RandomUtil;
-import org.jboss.messaging.core.remoting.impl.PacketFragmentBufferImpl;
import org.jboss.messaging.core.remoting.PacketFragment;
-import org.jboss.messaging.util.MessagingBuffer;
+import org.jboss.messaging.core.remoting.impl.PacketFragmentBufferImpl;
+import org.jboss.messaging.tests.util.RandomUtil;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.ByteBufferWrapper;
-import org.jboss.messaging.util.SimpleString;
import static org.jboss.messaging.util.DataConstants.NOT_NULL;
+import org.jboss.messaging.util.MessagingBuffer;
+import org.jboss.messaging.util.SimpleString;
import java.nio.ByteBuffer;
@@ -54,8 +54,7 @@
assertEquals(messagingBuffer.getInt(), 10);
assertEquals(messagingBuffer.getInt(), 0);
assertEquals(buffer.getPacketFragments().size(), 1);
- assertEquals(buffer.getPacketFragments().get(0).getDataStartPosition(), 13);
- assertEquals(buffer.getPacketFragments().get(0).getDataStartPosition(), 13);
+ assertEquals(buffer.getPacketFragments().get(0).getMessagingBuffer().position(), 13);
}
public void testPutFloat()
More information about the jboss-cvs-commits
mailing list