[jboss-cvs] JBoss Messaging SVN: r5934 - in branches/JBMESSAGING_1394: src/main/org/jboss/messaging/core/journal/impl and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 25 23:18:19 EST 2009
Author: clebert.suconic at jboss.com
Date: 2009-02-25 23:18:19 -0500 (Wed, 25 Feb 2009)
New Revision: 5934
Modified:
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
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/nullpm/NullStorageLargeServerMessage.java
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ByteBufferBackedChannelBuffer.java
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ChannelBuffer.java
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java
branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java
Log:
Backup
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -27,6 +27,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Channel;
import org.jboss.messaging.core.remoting.buffers.ByteBufferBackedChannelBuffer;
+import org.jboss.messaging.core.remoting.buffers.HeapChannelBuffer;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionConsumerCloseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
@@ -708,7 +709,7 @@
private ClientMessageInternal createFileMessage(final byte[] header) throws Exception
{
- MessagingBuffer headerBuffer = new ByteBufferBackedChannelBuffer(ByteBuffer.wrap(header));
+ MessagingBuffer headerBuffer = new HeapChannelBuffer(header);
if (isFileConsumer())
{
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -1843,33 +1843,35 @@
2 +
(transactionData != null ? transactionData.getEncodeSize() + SIZE_INT : 0);
- ByteBuffer bb = newBuffer(size);
+ ByteBuffer internalBuffer = newBuffer(size);
- bb.put(recordType);
- bb.putInt(-1); // skip ID part
- bb.putLong(txID);
+ ByteBufferBackedChannelBuffer bb = new ByteBufferBackedChannelBuffer(internalBuffer);
+
+ bb.writeByte(recordType);
+ bb.writeInt(-1); // skip ID part
+ bb.writeLong(txID);
if (transactionData != null)
{
- bb.putInt(transactionData.getEncodeSize());
+ bb.writeInt(transactionData.getEncodeSize());
}
- bb.putInt(tx.getElementsSummary().size());
+ bb.writeInt(tx.getElementsSummary().size());
if (transactionData != null)
{
- transactionData.encode(new ByteBufferBackedChannelBuffer(bb));
+ transactionData.encode(bb);
}
for (Map.Entry<Integer, AtomicInteger> entry : tx.getElementsSummary().entrySet())
{
- bb.putInt(entry.getKey());
- bb.putInt(entry.getValue().get());
+ bb.writeInt(entry.getKey());
+ bb.writeInt(entry.getValue().get());
}
- bb.putInt(size);
+ bb.writeInt(size);
- return bb;
+ return internalBuffer;
}
private boolean isTransaction(final byte recordType)
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -92,29 +92,32 @@
{
ArrayList<PagedMessage> messages = new ArrayList<PagedMessage>();
- ByteBuffer buffer = fileFactory.newBuffer((int)file.size());
+ ByteBuffer buffer2 = fileFactory.newBuffer((int)file.size());
file.position(0);
- file.read(buffer);
+ file.read(buffer2);
+
+ buffer2.rewind();
- ByteBufferBackedChannelBuffer messageBuffer = new ByteBufferBackedChannelBuffer(buffer);
+ ByteBufferBackedChannelBuffer fileBuffer = new ByteBufferBackedChannelBuffer(buffer2);
+ fileBuffer.writerIndex(fileBuffer.capacity());
- while (buffer.hasRemaining())
+ while (fileBuffer.readable())
{
- final int position = buffer.position();
+ final int position = fileBuffer.readerIndex();
- byte byteRead = buffer.get();
+ byte byteRead = fileBuffer.readByte();
if (byteRead == START_BYTE)
{
- if (buffer.position() + SIZE_INT < buffer.limit())
+ if (fileBuffer.readerIndex() + SIZE_INT < fileBuffer.capacity())
{
- int messageSize = buffer.getInt();
- int oldPos = buffer.position();
- if (buffer.position() + messageSize < buffer.limit() && buffer.get(oldPos + messageSize) == END_BYTE)
+ int messageSize = fileBuffer.readInt();
+ int oldPos = fileBuffer.readerIndex();
+ if (fileBuffer.readerIndex() + messageSize < fileBuffer.capacity() && fileBuffer.getByte(oldPos + messageSize) == END_BYTE)
{
PagedMessage msg = new PagedMessageImpl();
- msg.decode(messageBuffer);
- if (buffer.get() != END_BYTE)
+ msg.decode(fileBuffer);
+ if (fileBuffer.readByte() != END_BYTE)
{
// Sanity Check: This would only happen if there is a bug on decode or any internal code, as this
// constraint was already checked
@@ -144,10 +147,13 @@
public void write(final PagedMessage message) throws Exception
{
ByteBuffer buffer = fileFactory.newBuffer(message.getEncodeSize() + SIZE_RECORD);
- buffer.put(START_BYTE);
- buffer.putInt(message.getEncodeSize());
- message.encode(new ByteBufferBackedChannelBuffer(buffer));
- buffer.put(END_BYTE);
+
+ ByteBufferBackedChannelBuffer wrap = new ByteBufferBackedChannelBuffer(buffer);
+ wrap.writeByte(START_BYTE);
+ wrap.writeInt(message.getEncodeSize());
+ message.encode(wrap);
+ wrap.writeByte(END_BYTE);
+
buffer.rewind();
file.write(buffer, false);
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 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -469,10 +469,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/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -76,7 +76,7 @@
else
{
// Reuse the initial byte array on the buffer construction
- buffer = new DynamicChannelBuffer(bytes);
+ setBody(new DynamicChannelBuffer(bytes));
}
}
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ByteBufferBackedChannelBuffer.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ByteBufferBackedChannelBuffer.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ByteBufferBackedChannelBuffer.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -63,7 +63,7 @@
this.buffer = buffer.slice();
capacity = buffer.remaining();
- writerIndex(buffer.position());
+ writerIndex(0);
}
private ByteBufferBackedChannelBuffer(final ByteBufferBackedChannelBuffer buffer)
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ChannelBuffer.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ChannelBuffer.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/core/remoting/buffers/ChannelBuffer.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -31,11 +31,7 @@
import java.nio.channels.ScatteringByteChannel;
import java.nio.charset.UnsupportedCharsetException;
-import org.jboss.netty.buffer.ChannelBufferIndexFinder;
-import org.jboss.netty.buffer.ChannelBufferInputStream;
-import org.jboss.netty.buffer.ChannelBufferOutputStream;
-
/**
* A random and sequential accessible sequence of zero or more bytes (octets).
* This interface provides an abstract view for one or more primitive byte
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -119,7 +119,7 @@
{
return getBody().readByte();
}
- catch (BufferUnderflowException e)
+ catch (IndexOutOfBoundsException e)
{
throw new MessageEOFException("");
}
Modified: branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java
===================================================================
--- branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -155,7 +155,7 @@
throw new MessageFormatException("Invalid conversion");
}
}
- catch (BufferUnderflowException e)
+ catch (IndexOutOfBoundsException e)
{
throw new MessageEOFException("");
}
Modified: branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -24,7 +24,6 @@
import static org.easymock.EasyMock.expect;
import java.io.Serializable;
-import java.nio.ByteBuffer;
import java.util.Enumeration;
import java.util.HashSet;
@@ -44,7 +43,8 @@
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.buffers.HeapChannelBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossBytesMessage;
import org.jboss.messaging.jms.client.JBossMapMessage;
import org.jboss.messaging.jms.client.JBossMessage;
@@ -681,7 +681,7 @@
public void testCopyOnJBossMessage() throws JMSException
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
- ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
+ MessagingBuffer body = new HeapChannelBuffer(1024);
ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -699,7 +699,7 @@
public void testCopyOnForeignMessage() throws JMSException
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
- ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
+ MessagingBuffer body = new HeapChannelBuffer(1024);
ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -716,7 +716,7 @@
public void testCopyOnForeignBytesMessage() throws JMSException
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
- ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
+ MessagingBuffer body = new HeapChannelBuffer(1024);
ClientMessage clientMessage = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -739,7 +739,7 @@
public void testCopyOnForeignMapMessage() throws JMSException
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
- ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
+ MessagingBuffer body = new HeapChannelBuffer(1024);
ClientMessage clientMessage = new ClientMessageImpl(JBossMapMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -757,7 +757,7 @@
public void testCopyOnForeignObjectMessage() throws JMSException
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
- ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
+ MessagingBuffer body = new HeapChannelBuffer(1024);
ClientMessage clientMessage = new ClientMessageImpl(JBossObjectMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -773,7 +773,7 @@
public void testCopyOnForeignStreamMessage() throws JMSException
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
- ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
+ MessagingBuffer body = new HeapChannelBuffer(1024);
ClientMessage clientMessage = new ClientMessageImpl(JBossStreamMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -793,7 +793,7 @@
public void testCopyOnForeignTextMessage() throws JMSException
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
- ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
+ MessagingBuffer body = new HeapChannelBuffer(1024);
ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -23,7 +23,6 @@
package org.jboss.messaging.tests.integration.cluster.failover;
import java.io.File;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
@@ -32,7 +31,6 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
import org.jboss.messaging.core.server.Messaging;
@@ -52,6 +50,7 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
+ private final byte[] FIVE_HUNDRED_BYTES = new byte[500];
// Static --------------------------------------------------------
@@ -62,18 +61,17 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
-
+
protected ClientSessionFactoryInternal createSessionFactory()
{
ClientSessionFactoryInternal sf = super.createSessionFactory();
-
+
sf.setMinLargeMessageSize(200);
-
+
return sf;
}
-
@Override
protected void start() throws Exception
{
@@ -124,11 +122,12 @@
liveService.start();
}
-
+
@Override
protected void setBody(final ClientMessage message) throws Exception
{
- message.setBody(new ByteBufferWrapper(ByteBuffer.allocate(500)));
+
+ message.getBody().writeBytes(FIVE_HUNDRED_BYTES);
}
@@ -138,7 +137,7 @@
@Override
protected boolean checkSize(ClientMessage message)
{
- return 500 == message.getBodySize();
+ return 500 == message.getBodySize();
}
// Private -------------------------------------------------------
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -68,7 +68,6 @@
@Override
protected void setBody(final ClientMessage message) throws Exception
{
- message.getBody().flip();
}
/* (non-Javadoc)
@@ -77,7 +76,7 @@
@Override
protected boolean checkSize(final ClientMessage message)
{
- return 0 == message.getBody().limit();
+ return 0 == message.getBody().writerIndex();
}
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -991,8 +991,6 @@
0,
System.currentTimeMillis(),
(byte)1);
- message.getBody().flip();
-
producer.send(message);
ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
@@ -1029,8 +1027,6 @@
0,
System.currentTimeMillis(),
(byte)1);
- message.getBody().flip();
-
producer.send(message);
ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
@@ -1224,8 +1220,6 @@
0,
System.currentTimeMillis(),
(byte)1);
- message.getBody().flip();
-
producer.send(message);
sess.start();
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -35,7 +35,6 @@
import org.jboss.messaging.core.paging.PagingManager;
import org.jboss.messaging.core.paging.PagingStore;
import org.jboss.messaging.core.remoting.RemotingConnection;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.impl.RemotingConnectionImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnector;
import org.jboss.messaging.util.SimpleString;
@@ -100,14 +99,8 @@
for (int i = 0; i < numMessages; i++)
{
ClientMessage message = session.createClientMessage(true);
- ByteBuffer buffer = ByteBuffer.allocate(1000);
+ message.getBody().writeInt(i);
- buffer.putInt(i);
-
- buffer.rewind();
-
- message.setBody(new ByteBufferWrapper(buffer));
-
producer.send(message);
if (storeLive.isPaging())
@@ -145,8 +138,6 @@
message.acknowledge();
- message.getBody().rewind();
-
assertEquals(i, message.getBody().readInt());
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -303,7 +303,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -418,7 +417,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -533,7 +531,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -547,7 +544,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -684,7 +680,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -698,7 +693,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -844,7 +838,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -932,7 +925,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -1034,7 +1026,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -1048,7 +1039,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -1171,7 +1161,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -1185,7 +1174,6 @@
System.currentTimeMillis(),
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
- message.getBody().flip();
producer.send(message);
}
@@ -1293,8 +1281,6 @@
0,
System.currentTimeMillis(),
(byte)1);
- message.getBody().flip();
-
producer.send(message);
ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
@@ -1329,8 +1315,6 @@
0,
System.currentTimeMillis(),
(byte)1);
- message.getBody().flip();
-
producer.send(message);
ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
@@ -1403,8 +1387,6 @@
0,
System.currentTimeMillis(),
(byte)1);
- message.getBody().flip();
-
producer.send(message);
sess.start();
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -113,7 +113,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -189,7 +188,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
log.info("Sent messages");
@@ -279,7 +277,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
log.info("Sent messages");
@@ -359,7 +356,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
log.info("Sent messages");
@@ -451,7 +447,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
log.info("Sent messages");
@@ -546,7 +541,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
log.info("Sent messages");
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -121,7 +121,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
ClientConsumer consumer = session.createConsumer(ADDRESS);
@@ -194,7 +193,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
ClientConsumer consumer = session.createConsumer(ADDRESS);
@@ -235,7 +233,6 @@
message = session.createClientMessage(JBossTextMessage.TYPE, false, 0, System.currentTimeMillis(), (byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -107,7 +107,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -161,7 +160,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -240,7 +238,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -322,7 +319,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -391,7 +387,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -483,7 +478,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -632,7 +626,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -742,7 +735,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), k);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -98,7 +98,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -113,7 +113,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), sendCount++);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
@@ -179,7 +178,6 @@
(byte)1);
message.putIntProperty(new SimpleString("count"), i + numMessages);
message.getBody().writeString("aardvarks");
- message.getBody().flip();
producer.send(message);
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -592,7 +592,6 @@
System.currentTimeMillis(),
(byte)1);
message.getBody().writeString(msg);
- message.getBody().flip();
return message;
}
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -74,7 +74,6 @@
ClientMessage message = session.createClientMessage(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().writeString("CoreClientOverHttpTest");
- message.getBody().flip();
producer.send(message);
}
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -71,12 +71,10 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
conn.write(buff);
buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
acceptorListener.connection.write(buff);
}
acceptorLatch.await(10, TimeUnit.SECONDS);
@@ -123,7 +121,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
conn.write(buff);
}
for (int i = 0; i < numPackets; i++)
@@ -131,7 +128,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
acceptorListener.connection.write(buff);
}
acceptorLatch.await(10, TimeUnit.SECONDS);
@@ -178,7 +174,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
acceptorListener.connection.write(buff);
}
@@ -187,7 +182,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
conn.write(buff);
}
acceptorLatch.await(10, TimeUnit.SECONDS);
@@ -234,7 +228,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
acceptorListener.connection.write(buff);
}
@@ -242,7 +235,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(0);
- buff.flip();
conn.write(buff);
acceptorLatch.await(10, TimeUnit.SECONDS);
@@ -290,7 +282,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
acceptorListener.connection.write(buff);
}
@@ -340,7 +331,6 @@
MessagingBuffer buff = conn.createBuffer(8);
buff.writeInt(4);
buff.writeInt(i);
- buff.flip();
conn.write(buff);
}
acceptorLatch.await(100, TimeUnit.SECONDS);
Modified: branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java
===================================================================
--- branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java 2009-02-26 02:04:43 UTC (rev 5933)
+++ branches/JBMESSAGING_1394/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java 2009-02-26 04:18:19 UTC (rev 5934)
@@ -31,7 +31,7 @@
import org.jboss.messaging.core.paging.PagedMessage;
import org.jboss.messaging.core.paging.impl.PageImpl;
import org.jboss.messaging.core.paging.impl.PagedMessageImpl;
-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.tests.util.RandomUtil;
@@ -76,7 +76,7 @@
SimpleString simpleDestination = new SimpleString("Test");
- ArrayList<ByteBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements);
+ ArrayList<HeapChannelBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements);
impl.sync();
impl.close();
@@ -123,7 +123,7 @@
SimpleString simpleDestination = new SimpleString("Test");
- ArrayList<ByteBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements);
+ ArrayList<HeapChannelBuffer> buffers = addPageElements(simpleDestination, impl, numberOfElements);
impl.sync();
@@ -188,19 +188,20 @@
* @return
* @throws Exception
*/
- protected ArrayList<ByteBuffer> addPageElements(SimpleString simpleDestination, PageImpl page, int numberOfElements) throws Exception
+ protected ArrayList<HeapChannelBuffer> addPageElements(SimpleString simpleDestination, PageImpl page, int numberOfElements) throws Exception
{
- ArrayList<ByteBuffer> buffers = new ArrayList<ByteBuffer>();
+ ArrayList<HeapChannelBuffer> buffers = new ArrayList<HeapChannelBuffer>();
int initialNumberOfMessages = page.getNumberOfMessages();
for (int i = 0; i < numberOfElements; i++)
{
- ByteBuffer buffer = ByteBuffer.allocate(10);
+ HeapChannelBuffer buffer = new HeapChannelBuffer(10);
- for (int j = 0; j < buffer.limit(); j++)
+ for (int j = 0; j < buffer.capacity(); j++)
{
- buffer.put(RandomUtil.randomByte());
+ //buffer.writeByte(RandomUtil.randomByte());
+ buffer.writeByte((byte)'b');
}
buffers.add(buffer);
@@ -210,7 +211,7 @@
0,
System.currentTimeMillis(),
(byte)0,
- new ByteBufferWrapper(buffer));
+ buffer);
msg.setMessageID(i);
More information about the jboss-cvs-commits
mailing list