[jboss-cvs] JBoss Messaging SVN: r5943 - in branches/JBMESSAGING_1394: src/main/org/jboss/messaging/integration/transports and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 26 15:56:59 EST 2009
Author: clebert.suconic at jboss.com
Date: 2009-02-26 15:56:58 -0500 (Thu, 26 Feb 2009)
New Revision: 5943
Removed:
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/integration/transports/mina/
Modified:
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageTransactionImplTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
Log:
Last commit on the branch before merge
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -709,10 +709,8 @@
{
byte[] data = record.data;
- ByteBuffer bb = ByteBuffer.wrap(data);
+ MessagingBuffer buff = new HeapChannelBuffer(data);
- MessagingBuffer buff = new ByteBufferBackedChannelBuffer(bb);
-
byte recordType = record.getUserRecordType();
switch (recordType)
Modified: branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -144,7 +144,7 @@
if (clearDatabase)
{
- // Delete the BDB environment
+ // Delete the Journal environment
File dir = new File("data");
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -49,7 +49,7 @@
import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.ServerMessage;
@@ -89,7 +89,7 @@
// invoke attribute and operation on the server
ServerMessage message = new ServerMessageImpl();
- MessagingBuffer body = new ByteBufferWrapper(ByteBuffer.allocate(2048));
+ MessagingBuffer body = new HeapChannelBuffer(2048);
message.setBody(body);
ManagementHelper.putAttributes(message, ObjectNames.getAddressObjectName(address), "Address");
@@ -121,7 +121,7 @@
// invoke attribute and operation on the server
ServerMessage message = new ServerMessageImpl();
- MessagingBuffer body = new ByteBufferWrapper(ByteBuffer.allocate(2048));
+ MessagingBuffer body = new HeapChannelBuffer(2048);
message.setBody(body);
ManagementHelper.putOperationInvocation(message,
on,
@@ -162,7 +162,7 @@
// invoke attribute and operation on the server
ServerMessage message = new ServerMessageImpl();
- MessagingBuffer body = new ByteBufferWrapper(ByteBuffer.allocate(2048));
+ MessagingBuffer body = new HeapChannelBuffer(2048);
message.setBody(body);
ManagementHelper.putOperationInvocation(message,
on,
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -25,7 +25,6 @@
import java.io.File;
import java.lang.management.ManagementFactory;
import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.Executor;
@@ -47,10 +46,8 @@
import org.jboss.messaging.core.paging.impl.PagingStoreImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.server.RemotingService;
import org.jboss.messaging.core.remoting.server.impl.RemotingServiceImpl;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.security.JBMSecurityManager;
import org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl;
import org.jboss.messaging.core.server.MessagingServer;
@@ -175,14 +172,10 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ByteBuffer ioBuffer = ByteBuffer.allocate(1024);
-
ClientMessage message = null;
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
-
message = session.createClientMessage(true);
- message.setBody(bodyLocal);
+ message.getBody().writeBytes(new byte[1024]);
PagingStore store = service.getServer().getPostOffice().getPagingManager().getPageStore(ADDRESS);
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -33,12 +33,12 @@
import org.jboss.messaging.core.paging.impl.PagingStoreFactoryNIO;
import org.jboss.messaging.core.paging.impl.TestSupportPageStore;
import org.jboss.messaging.core.persistence.impl.nullpm.NullStorageManager;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
import org.jboss.messaging.core.settings.HierarchicalRepository;
+import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.core.settings.impl.HierarchicalObjectRepository;
-import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
@@ -124,7 +124,7 @@
0,
System.currentTimeMillis(),
(byte)0,
- new ByteBufferWrapper(buffer));
+ new HeapChannelBuffer(new byte[1024]));
msg.setMessageID(messageId);
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -35,7 +35,7 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.core.server.Queue;
@@ -110,25 +110,24 @@
ClientMessage message = null;
- MessagingBuffer body = null;
+ byte[] body = null;
for (int i = 0; i < numberOfMessages; i++)
{
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ message = session.createClientMessage(true);
+ MessagingBuffer bodyLocal = message.getBody();
+
for (int j = 1; j <= numberOfIntegers; j++)
{
bodyLocal.writeInt(j);
}
- bodyLocal.flip();
-
- if (i == 0)
+
+ if (body == null)
{
- body = bodyLocal;
+ body = bodyLocal.array();
}
- message = session.createClientMessage(true);
- message.setBody(bodyLocal);
message.putIntProperty(new SimpleString("id"), i);
producer.send(message);
@@ -165,11 +164,11 @@
try
{
- assertEqualsByteArrays(body.limit(), body.array(), message2.getBody().array());
+ assertEqualsByteArrays(body.length, body, message2.getBody().array());
}
catch (AssertionFailedError e)
{
- log.info("Expected buffer:" + dumbBytesHex(body.array(), 40));
+ log.info("Expected buffer:" + dumbBytesHex(body, 40));
log.info("Arriving buffer:" + dumbBytesHex(message2.getBody().array(), 40));
throw e;
}
@@ -232,8 +231,7 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ByteBuffer ioBuffer = ByteBuffer.allocate(DataConstants.SIZE_INT * numberOfIntegers);
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ MessagingBuffer bodyLocal = new HeapChannelBuffer(DataConstants.SIZE_INT * numberOfIntegers);
ClientMessage message = null;
@@ -374,29 +372,29 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ByteBuffer ioBuffer = ByteBuffer.allocate(DataConstants.SIZE_INT * numberOfIntegers);
-
ClientMessage message = null;
- MessagingBuffer body = null;
+ byte[] body = null;
long scheduledTime = System.currentTimeMillis() + 5000;
for (int i = 0; i < numberOfMessages; i++)
{
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ message = session.createClientMessage(true);
+ MessagingBuffer bodyLocal = message.getBody();
+
for (int j = 1; j <= numberOfIntegers; j++)
{
bodyLocal.writeInt(j);
}
- bodyLocal.flip();
- if (i == 0)
+
+ if (body == null)
{
- body = bodyLocal;
+ body = bodyLocal.array();
}
- message = session.createClientMessage(true);
+
message.setBody(bodyLocal);
message.putIntProperty(new SimpleString("id"), i);
@@ -445,11 +443,11 @@
try
{
- assertEqualsByteArrays(body.limit(), body.array(), message2.getBody().array());
+ assertEqualsByteArrays(body.length, body, message2.getBody().array());
}
catch (AssertionFailedError e)
{
- log.info("Expected buffer:" + dumbBytesHex(body.array(), 40));
+ log.info("Expected buffer:" + dumbBytesHex(body, 40));
log.info("Arriving buffer:" + dumbBytesHex(message2.getBody().array(), 40));
throw e;
}
@@ -514,16 +512,16 @@
for (int i = 0; i < numberOfMessages; i++)
{
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ message = session.createClientMessage(true);
+ MessagingBuffer bodyLocal = message.getBody();
+
for (int j = 1; j <= numberOfIntegers; j++)
{
bodyLocal.writeInt(j);
}
- bodyLocal.flip();
- message = session.createClientMessage(true);
- message.setBody(bodyLocal);
+
message.putIntProperty(new SimpleString("id"), i);
producer.send(message);
@@ -593,16 +591,15 @@
for (int i = 0; i < numberOfMessages; i++)
{
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ message = session.createClientMessage(true);
+
+ MessagingBuffer bodyLocal = message.getBody();
for (int j = 1; j <= numberOfIntegers; j++)
{
bodyLocal.writeInt(j);
}
- bodyLocal.flip();
- message = session.createClientMessage(true);
- message.setBody(bodyLocal);
message.putIntProperty(new SimpleString("id"), i);
producer.send(message);
@@ -706,13 +703,11 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ByteBuffer ioBuffer = ByteBuffer.allocate(sizeOfMessage);
-
ClientMessage message = null;
for (int i = 0; i < numberOfMessages; i++)
{
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ MessagingBuffer bodyLocal = new HeapChannelBuffer(new byte[1024]);
message = session.createClientMessage(true);
message.setBody(bodyLocal);
@@ -746,7 +741,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ MessagingBuffer bodyLocal = new HeapChannelBuffer(new byte[1024]);
message = session.createClientMessage(true);
message.setBody(bodyLocal);
@@ -773,7 +768,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ MessagingBuffer bodyLocal = new HeapChannelBuffer(new byte[1024]);
message = session.createClientMessage(true);
message.setBody(bodyLocal);
@@ -857,11 +852,9 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ByteBuffer ioBuffer = ByteBuffer.allocate(MAX_SIZE - 1024); // A single message with almost maxPageSize
-
ClientMessage message = null;
- MessagingBuffer bodyLocal = new ByteBufferWrapper(ioBuffer);
+ MessagingBuffer bodyLocal = new HeapChannelBuffer(new byte[1024]);
message = session.createClientMessage(true);
message.setBody(bodyLocal);
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -59,7 +59,8 @@
protected void setUp() throws Exception
{
- super.clearData();
+ super.setUp();
+ clearData();
configuration = createDefaultConfig();
configuration.setSecurityEnabled(false);
configuration.setJournalMinFiles(2);
@@ -292,7 +293,6 @@
System.currentTimeMillis(),
(byte)1);
message.getBody().writeString("testINVMCoreClient");
- message.getBody().flip();
message.setDurable(true);
long time = System.currentTimeMillis();
time += 10000;
@@ -579,7 +579,6 @@
System.currentTimeMillis(),
(byte)1);
message.getBody().writeString("testINVMCoreClient");
- message.getBody().flip();
message.setDurable(true);
Calendar cal = Calendar.getInstance();
cal.roll(Calendar.SECOND, 10);
@@ -629,7 +628,6 @@
System.currentTimeMillis(),
(byte)1);
message.getBody().writeString(body);
- message.getBody().flip();
message.setDurable(true);
return message;
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -1247,7 +1247,6 @@
System.currentTimeMillis(),
(byte)1);
message.getBody().writeString(s);
- message.getBody().flip();
return message;
}
@@ -1259,7 +1258,6 @@
System.currentTimeMillis(),
(byte)1);
message.getBody().writeBytes(b);
- message.getBody().flip();
return message;
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -32,7 +32,6 @@
import org.jboss.messaging.core.client.ClientSessionFactory;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.core.settings.impl.AddressSettings;
@@ -121,11 +120,7 @@
session = factory.createSession(false, true, true);
producer = session.createProducer(adr);
msg = session.createClientMessage(true);
-
- ByteBuffer buffer = ByteBuffer.allocate(SIZE_OF_MESSAGE);
- MessagingBuffer msgBuffer = new ByteBufferWrapper(buffer);
- msg.setBody(msgBuffer);
-
+ msg.getBody().writeBytes(new byte[SIZE_OF_MESSAGE]);
}
// run is not going to close sessions or anything, as we don't want to measure that time
@@ -226,9 +221,7 @@
ClientProducer producer = session.createProducer(adr);
ClientMessage msg = session.createClientMessage(true);
- ByteBuffer buffer = ByteBuffer.allocate(messageSize);
- MessagingBuffer msgBuffer = new ByteBufferWrapper(buffer);
- msg.setBody(msgBuffer);
+ msg.getBody().writeBytes(new byte[messageSize]);
sendMessages(nMessages, producer, msg);
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -31,7 +31,7 @@
import org.jboss.messaging.core.config.impl.FileConfiguration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
@@ -181,7 +181,7 @@
0,
/* timestamp */0, /* priority */
(byte)0,
- new ByteBufferWrapper(ByteBuffer.allocateDirect(1024)));
+ new HeapChannelBuffer(new byte[1024]));
implMsg.putStringProperty(new SimpleString("Key"), new SimpleString("This String is worthless!"));
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -22,7 +22,8 @@
package org.jboss.messaging.tests.timing.util;
-import org.jboss.messaging.integration.transports.netty.ChannelBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.UTF8Util;
@@ -55,7 +56,7 @@
public void testWriteUTF() throws Exception
{
- ChannelBufferWrapper buffer = new ChannelBufferWrapper(10 * 1024);
+ MessagingBuffer buffer = new HeapChannelBuffer(10 * 1024);
long start = System.currentTimeMillis();
@@ -68,7 +69,7 @@
start = System.currentTimeMillis();
}
- buffer.rewind();
+ buffer.clear();
buffer.writeUTF(str);
}
@@ -80,7 +81,7 @@
public void testReadUTF() throws Exception
{
- ChannelBufferWrapper buffer = new ChannelBufferWrapper(10 * 1024);
+ MessagingBuffer buffer = new HeapChannelBuffer(10 * 1024);
buffer.writeUTF(str);
@@ -95,7 +96,7 @@
start = System.currentTimeMillis();
}
- buffer.rewind();
+ buffer.resetReaderIndex();
String newstr = buffer.readUTF();
assertEquals(str, newstr);
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -26,7 +26,7 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.message.impl.MessageImplTestBase;
import org.jboss.messaging.tests.util.RandomUtil;
@@ -72,16 +72,17 @@
for (int i = 0; i < 10; i++)
{
boolean durable = RandomUtil.randomBoolean();
- ByteBuffer bb = ByteBuffer.wrap(new byte[1000]);
- MessagingBuffer body = new ByteBufferWrapper(bb);
-
+ MessagingBuffer body = new HeapChannelBuffer(new byte[0]);
+
ClientMessage msg = new ClientMessageImpl(durable, body);
+
assertEquals(durable, msg.isDurable());
assertEquals(body, msg.getBody());
assertEquals(0, msg.getType());
assertEquals(0, msg.getExpiration());
- assertTrue(System.currentTimeMillis() - msg.getTimestamp() < 5);
+ assertTrue("i = " + i + "Time is = " + (System.currentTimeMillis() - msg.getTimestamp()), System.currentTimeMillis() - msg.getTimestamp() < 5);
+
assertEquals((byte)4, msg.getPriority());
}
}
@@ -93,7 +94,7 @@
byte type = RandomUtil.randomByte();
boolean durable = RandomUtil.randomBoolean();
ByteBuffer bb = ByteBuffer.wrap(new byte[1000]);
- MessagingBuffer body = new ByteBufferWrapper(bb);
+ MessagingBuffer body = new HeapChannelBuffer(new byte[1000]);
ClientMessage msg = new ClientMessageImpl(type, durable, body);
assertEquals(type, msg.getType());
@@ -113,7 +114,7 @@
byte type = RandomUtil.randomByte();
boolean durable = RandomUtil.randomBoolean();
ByteBuffer bb = ByteBuffer.wrap(new byte[1000]);
- MessagingBuffer body = new ByteBufferWrapper(bb);
+ MessagingBuffer body = new HeapChannelBuffer(new byte[1000]);
long expiration = RandomUtil.randomLong();
long timestamp = RandomUtil.randomLong();
byte priority = RandomUtil.randomByte();
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -32,13 +32,13 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomShort;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import java.nio.ByteBuffer;
import java.util.Set;
import org.jboss.messaging.core.journal.EncodingSupport;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.DynamicChannelBuffer;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
@@ -68,19 +68,16 @@
{
bytes[i] = randomByte();
}
- ByteBuffer bb = ByteBuffer.wrap(bytes);
- MessagingBuffer body = new ByteBufferWrapper(bb);
+ MessagingBuffer body = new HeapChannelBuffer(bytes);
Message message = createMessage(randomByte(), randomBoolean(), randomLong(),
randomLong(), randomByte(), body);
message.setDestination(new SimpleString("oasoas"));
message.putStringProperty(new SimpleString("prop1"), new SimpleString("blah1"));
message.putStringProperty(new SimpleString("prop2"), new SimpleString("blah2"));
- ByteBuffer bbMsg = ByteBuffer.allocate(message.getEncodeSize());
- MessagingBuffer buffer = new ByteBufferWrapper(bbMsg);
+ MessagingBuffer buffer = new HeapChannelBuffer(message.getEncodeSize());
message.encode(buffer);
Message message2 = createMessage();
- buffer.flip();
message2.decode(buffer);
assertMessagesEquivalent(message, message2);
}
@@ -95,8 +92,7 @@
{
bytes[i] = randomByte();
}
- ByteBuffer bb = ByteBuffer.wrap(bytes);
- MessagingBuffer body = new ByteBufferWrapper(bb);
+ MessagingBuffer body = new HeapChannelBuffer(bytes);
final byte type = randomByte();
final boolean durable = randomBoolean();
@@ -162,17 +158,15 @@
public void testEncodingMessage() throws Exception
{
- byte[] bytes = new byte[]{(byte)1, (byte)2, (byte)3};
- final IoBufferWrapper bufferBody = new IoBufferWrapper(bytes.length);
- bufferBody.writeBytes(bytes);
SimpleString address = new SimpleString("Simple Destination ");
Message msg = createMessage();
- msg.setBody(new ByteBufferWrapper(ByteBuffer.allocateDirect(1024)));
+
+ byte[] bytes = new byte[]{(byte)1, (byte)2, (byte)3};
+ msg.setBody(new HeapChannelBuffer(bytes));
msg.setDestination(address);
- msg.setBody(bufferBody);
msg.putStringProperty(new SimpleString("Key"), new SimpleString("This String is worthless!"));
msg.putStringProperty(new SimpleString("Key"), new SimpleString("This String is worthless and bigger!"));
msg.putStringProperty(new SimpleString("Key2"), new SimpleString("This String is worthless and bigger and bigger!"));
@@ -345,21 +339,20 @@
private void checkSizes(final Message obj, final EncodingSupport newObject)
{
- ByteBuffer bf = ByteBuffer.allocateDirect(1024);
- ByteBufferWrapper buffer = new ByteBufferWrapper(bf);
+ MessagingBuffer buffer = new HeapChannelBuffer(1024);
obj.encode(buffer);
- assertEquals (buffer.position(), obj.getEncodeSize());
- int originalSize = buffer.position();
-
- bf.rewind();
+ assertEquals (buffer.writerIndex(), obj.getEncodeSize());
+ int originalSize = buffer.writerIndex();
+
+ buffer.resetReaderIndex();
newObject.decode(buffer);
- bf = ByteBuffer.allocateDirect(1024 * 10);
- buffer = new ByteBufferWrapper(bf);
+
+ MessagingBuffer newBuffer = new HeapChannelBuffer(1024);
- newObject.encode(buffer);
+ newObject.encode(newBuffer);
- assertEquals(newObject.getEncodeSize(), bf.position());
- assertEquals(originalSize, bf.position());
+ assertEquals(newObject.getEncodeSize(), newBuffer.writerIndex());
+ assertEquals(originalSize, newBuffer.writerIndex());
}
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageTransactionImplTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageTransactionImplTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageTransactionImplTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -22,11 +22,9 @@
package org.jboss.messaging.tests.unit.core.paging.impl;
-import java.nio.ByteBuffer;
-
import org.jboss.messaging.core.paging.PageTransactionInfo;
import org.jboss.messaging.core.paging.impl.PageTransactionInfoImpl;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.tests.util.UnitTestCase;
@@ -67,14 +65,12 @@
assertEquals(nr1, trans.getNumberOfMessages());
- ByteBuffer buffer = ByteBuffer.allocate(trans.getEncodeSize());
- MessagingBuffer wrapper = new ByteBufferWrapper(buffer);
+ MessagingBuffer buffer = new HeapChannelBuffer(trans.getEncodeSize());
- trans.encode(wrapper);
- wrapper.rewind();
+ trans.encode(buffer);
PageTransactionInfo trans2 = new PageTransactionInfoImpl(id1);
- trans2.decode(wrapper);
+ trans2.decode(buffer);
assertEquals(id2, trans2.getTransactionID());
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -22,7 +22,6 @@
package org.jboss.messaging.tests.unit.core.paging.impl;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
@@ -35,6 +34,7 @@
import org.jboss.messaging.core.paging.impl.PagedMessageImpl;
import org.jboss.messaging.core.paging.impl.PagingStoreImpl;
import org.jboss.messaging.core.paging.impl.TestSupportPageStore;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
import org.jboss.messaging.util.SimpleString;
@@ -108,9 +108,9 @@
assertEquals(1, storeImpl.getNumberOfPages());
- List<ByteBuffer> buffers = new ArrayList<ByteBuffer>();
+ List<MessagingBuffer> buffers = new ArrayList<MessagingBuffer>();
- ByteBuffer buffer = createRandomBuffer(0, 10);
+ MessagingBuffer buffer = createRandomBuffer(0, 10);
buffers.add(buffer);
SimpleString destination = new SimpleString("test");
@@ -165,12 +165,12 @@
storeImpl.startPaging();
- List<ByteBuffer> buffers = new ArrayList<ByteBuffer>();
+ List<MessagingBuffer> buffers = new ArrayList<MessagingBuffer>();
for (int i = 0; i < 10; i++)
{
- ByteBuffer buffer = createRandomBuffer(i + 1l, 10);
+ MessagingBuffer buffer = createRandomBuffer(i + 1l, 10);
buffers.add(buffer);
@@ -234,12 +234,12 @@
assertEquals(1, storeImpl.getNumberOfPages());
- List<ByteBuffer> buffers = new ArrayList<ByteBuffer>();
+ List<MessagingBuffer> buffers = new ArrayList<MessagingBuffer>();
for (int i = 0; i < 10; i++)
{
- ByteBuffer buffer = createRandomBuffer(i + 1l, 10);
+ MessagingBuffer buffer = createRandomBuffer(i + 1l, 10);
buffers.add(buffer);
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -22,7 +22,6 @@
package org.jboss.messaging.tests.unit.core.paging.impl;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -45,7 +44,8 @@
import org.jboss.messaging.core.paging.impl.TestSupportPageStore;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
import org.jboss.messaging.core.settings.impl.AddressSettings;
@@ -240,9 +240,8 @@
for (PagedMessage msg : msgs)
{
- msg.getMessage(null).getBody().rewind();
long id = msg.getMessage(null).getBody().readLong();
- msg.getMessage(null).getBody().rewind();
+ msg.getMessage(null).getBody().resetReaderIndex();
PagedMessageImpl msgWritten = buffers.remove(id);
buffers2.put(id, msg);
@@ -313,7 +312,6 @@
for (PagedMessage msg : msgs)
{
- msg.getMessage(null).getBody().rewind();
long id = msg.getMessage(null).getBody().readLong();
PagedMessage msgWritten = buffers2.remove(id);
assertNotNull(msgWritten);
@@ -329,7 +327,7 @@
lastPage.close();
assertEquals(1, lastMessages.size());
- lastMessages.get(0).getMessage(null).getBody().rewind();
+ lastMessages.get(0).getMessage(null).getBody().resetReaderIndex();
assertEquals(lastMessages.get(0).getMessage(null).getBody().readLong(), lastMessageId);
assertEqualsByteArrays(lastMessages.get(0).getMessage(null).getBody().array(), lastMsg.getMessage(null)
.getBody()
@@ -341,28 +339,28 @@
}
- protected PagedMessageImpl createMessage(final SimpleString destination, final ByteBuffer buffer)
+ protected PagedMessageImpl createMessage(final SimpleString destination, final MessagingBuffer buffer)
{
ServerMessage msg = new ServerMessageImpl((byte)1,
true,
0,
System.currentTimeMillis(),
(byte)0,
- new ByteBufferWrapper(buffer));
+ buffer);
msg.setDestination(destination);
return new PagedMessageImpl(msg);
}
- protected ByteBuffer createRandomBuffer(final long id, final int size)
+ protected MessagingBuffer createRandomBuffer(final long id, final int size)
{
- ByteBuffer buffer = ByteBuffer.allocate(size + 8);
+ MessagingBuffer buffer = new HeapChannelBuffer(size + 8);
- buffer.putLong(id);
+ buffer.writeLong(id);
- for (int j = 8; j < buffer.limit(); j++)
+ for (int j = 8; j < buffer.capacity(); j++)
{
- buffer.put(RandomUtil.randomByte());
+ buffer.writeByte(RandomUtil.randomByte());
}
return buffer;
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -23,7 +23,6 @@
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
-import java.nio.ByteBuffer;
import java.util.List;
import javax.transaction.xa.Xid;
@@ -40,7 +39,8 @@
import org.jboss.messaging.core.journal.TestableJournal;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
@@ -842,12 +842,8 @@
return false;
}
- byte newByte[] = new byte[expectedRecord.length];
+ MessagingBuffer wrapper = new HeapChannelBuffer(expectedRecord.length);
- ByteBuffer buffer = ByteBuffer.wrap(newByte);
-
- ByteBufferWrapper wrapper = new ByteBufferWrapper(buffer);
-
support.encode(wrapper);
byte encodingBytes[] = wrapper.array();
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -124,8 +124,6 @@
byte b = randomByte();
wrapper.writeByte(b);
- wrapper.flip();
-
assertEquals(b, wrapper.readByte());
}
@@ -134,17 +132,11 @@
byte b = (byte) 0xff;
wrapper.writeByte(b);
- wrapper.flip();
-
assertEquals(255, wrapper.readUnsignedByte());
- wrapper.rewind();
-
b = (byte) 0xf;
wrapper.writeByte(b);
- wrapper.flip();
-
assertEquals(b, wrapper.readUnsignedByte());
}
@@ -155,8 +147,6 @@
byte[] bytes = randomBytes();
wrapper.writeBytes(bytes);
- wrapper.flip();
-
byte[] b = new byte[bytes.length];
wrapper.readBytes(b);
assertEqualsByteArrays(bytes, b);
@@ -168,8 +158,6 @@
// put only half of the bytes
wrapper.writeBytes(bytes, 0, bytes.length / 2);
- wrapper.flip();
-
byte[] b = new byte[bytes.length / 2];
wrapper.readBytes(b, 0, b.length);
assertEqualsByteArrays(b.length, bytes, b);
@@ -179,8 +167,6 @@
{
wrapper.writeBoolean(true);
- wrapper.flip();
-
assertTrue(wrapper.readBoolean());
}
@@ -188,8 +174,6 @@
{
wrapper.writeBoolean(false);
- wrapper.flip();
-
assertFalse(wrapper.readBoolean());
}
@@ -197,8 +181,6 @@
{
wrapper.writeChar('a');
- wrapper.flip();
-
assertEquals('a', wrapper.readChar());
}
@@ -207,8 +189,6 @@
int i = randomInt();
wrapper.writeInt(i);
- wrapper.flip();
-
assertEquals(i, wrapper.readInt());
}
@@ -222,8 +202,6 @@
// rewrite firstInt at the beginning
wrapper.setInt(0, firstInt);
- wrapper.flip();
-
assertEquals(firstInt, wrapper.readInt());
assertEquals(secondInt, wrapper.readInt());
}
@@ -233,8 +211,6 @@
long l = randomLong();
wrapper.writeLong(l);
- wrapper.flip();
-
assertEquals(l, wrapper.readLong());
}
@@ -244,32 +220,22 @@
wrapper.writeShort(s1);
- wrapper.flip();
-
int s2 = wrapper.readUnsignedShort();
assertEquals(s1, s2);
- wrapper.rewind();
-
s1 = Short.MIN_VALUE;
wrapper.writeShort(s1);
- wrapper.flip();
-
s2 = wrapper.readUnsignedShort();
assertEquals(s1 * -1, s2);
- wrapper.rewind();
-
s1 = -1;
wrapper.writeShort(s1);
- wrapper.flip();
-
s2 = wrapper.readUnsignedShort();
// / The max of an unsigned short
@@ -281,8 +247,6 @@
{
wrapper.writeShort((short) 1);
- wrapper.flip();
-
assertEquals((short)1, wrapper.readShort());
}
@@ -291,8 +255,6 @@
double d = randomDouble();
wrapper.writeDouble(d);
- wrapper.flip();
-
assertEquals(d, wrapper.readDouble());
}
@@ -301,8 +263,6 @@
float f = randomFloat();
wrapper.writeFloat(f);
- wrapper.flip();
-
assertEquals(f, wrapper.readFloat());
}
@@ -311,8 +271,6 @@
String str = randomString();
wrapper.writeUTF(str);
- wrapper.flip();
-
assertEquals(str, wrapper.readUTF());
}
@@ -321,8 +279,6 @@
byte[] bytes = randomBytes(128);
wrapper.writeBytes(bytes);
- wrapper.flip();
-
byte[] array = wrapper.array();
assertEquals(wrapper.capacity(), array.length);
assertEqualsByteArrays(128, bytes, wrapper.array());
@@ -333,19 +289,15 @@
int i = randomInt();
wrapper.writeInt(i);
- wrapper.flip();
-
assertEquals(i, wrapper.readInt());
- wrapper.rewind();
-
assertEquals(i, wrapper.readInt());
}
public void testRemaining() throws Exception
{
int capacity = wrapper.capacity();
- assertEquals(capacity, wrapper.remaining());
+ assertEquals(capacity, wrapper.capacity());
// fill 1/3 of the buffer
int fill = capacity / 3;
@@ -353,20 +305,20 @@
wrapper.writeBytes(bytes);
// check the remaining is 2/3
- assertEquals(capacity - fill, wrapper.remaining());
+ assertEquals(capacity - fill, wrapper.readableBytes());
}
public void testPosition() throws Exception
{
- assertEquals(0, wrapper.position());
+ assertEquals(0, wrapper.writerIndex());
byte[] bytes = randomBytes(128);
wrapper.writeBytes(bytes);
- assertEquals(bytes.length, wrapper.position());
+ assertEquals(bytes.length, wrapper.writerIndex());
- wrapper.position(0);
- assertEquals(0, wrapper.position());
+ wrapper.writerIndex(0);
+ assertEquals(0, wrapper.writerIndex());
}
public void testLimit() throws Exception
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.netty;
+import org.jboss.messaging.core.remoting.buffers.DynamicChannelBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.integration.transports.netty.ChannelBufferWrapper;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
@@ -52,7 +52,7 @@
@Override
protected MessagingBuffer createBuffer()
{
- return new ChannelBufferWrapper(512);
+ return new DynamicChannelBuffer(512);
}
// Package protected ---------------------------------------------
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -28,7 +28,7 @@
import java.nio.ByteBuffer;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
@@ -71,8 +71,7 @@
{
bytes[i] = randomByte();
}
- ByteBuffer bb = ByteBuffer.wrap(bytes);
- MessagingBuffer body = new ByteBufferWrapper(bb);
+ MessagingBuffer body = new HeapChannelBuffer(bytes);
ServerMessageImpl message = new ServerMessageImpl(randomByte(), randomBoolean(), randomLong(),
randomLong(), randomByte(), body);
message.setDestination(new SimpleString("oasoas"));
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -17,7 +17,6 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomShort;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import static org.jboss.messaging.tests.util.UnitTestCase.assertEqualsByteArrays;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -29,7 +28,6 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossBytesMessage;
import org.jboss.messaging.tests.util.UnitTestCase;
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2009-02-26 17:33:21 UTC (rev 5942)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2009-02-26 20:56:58 UTC (rev 5943)
@@ -481,9 +481,10 @@
return false;
}
- byte[] compareArray = new byte[size];
+ final byte[] compareArray = new byte[size];
MessagingBuffer buffer = new HeapChannelBuffer(compareArray);
+ buffer.clear();
encoding.encode(buffer);
for (int i = 0; i < expectedArray.length; i++)
More information about the jboss-cvs-commits
mailing list