[jboss-cvs] JBoss Messaging SVN: r5211 - in branches/Branch_Chunk_CRS2: tests/jms-tests/src/org/jboss/test/messaging/jms and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 29 17:01:02 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-10-29 17:01:02 -0400 (Wed, 29 Oct 2008)
New Revision: 5211
Modified:
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java
branches/Branch_Chunk_CRS2/tests/jms-tests/src/org/jboss/test/messaging/jms/String64KLimitTest.java
Log:
Re-enabling String64KLimitTest
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2008-10-29 19:47:45 UTC (rev 5210)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2008-10-29 21:01:02 UTC (rev 5211)
@@ -104,7 +104,7 @@
checkRead();
try
{
- return body.getBoolean();
+ return getBody().getBoolean();
}
catch (BufferUnderflowException e)
{
@@ -117,7 +117,7 @@
checkRead();
try
{
- return body.getByte();
+ return getBody().getByte();
}
catch (BufferUnderflowException e)
{
@@ -130,7 +130,7 @@
checkRead();
try
{
- return body.getUnsignedByte();
+ return getBody().getUnsignedByte();
}
catch (BufferUnderflowException e)
{
@@ -143,7 +143,7 @@
checkRead();
try
{
- return body.getShort();
+ return getBody().getShort();
}
catch (BufferUnderflowException e)
{
@@ -156,7 +156,7 @@
checkRead();
try
{
- return body.getUnsignedShort();
+ return getBody().getUnsignedShort();
}
catch (BufferUnderflowException e)
{
@@ -169,7 +169,7 @@
checkRead();
try
{
- return body.getChar();
+ return getBody().getChar();
}
catch (BufferUnderflowException e)
{
@@ -182,7 +182,7 @@
checkRead();
try
{
- return body.getInt();
+ return getBody().getInt();
}
catch (BufferUnderflowException e)
{
@@ -195,7 +195,7 @@
checkRead();
try
{
- return body.getLong();
+ return getBody().getLong();
}
catch (BufferUnderflowException e)
{
@@ -208,7 +208,7 @@
checkRead();
try
{
- return body.getFloat();
+ return getBody().getFloat();
}
catch (BufferUnderflowException e)
{
@@ -221,7 +221,7 @@
checkRead();
try
{
- return body.getDouble();
+ return getBody().getDouble();
}
catch (BufferUnderflowException e)
{
@@ -234,7 +234,7 @@
checkRead();
try
{
- return body.getUTF();
+ return getBody().getUTF();
}
catch (BufferUnderflowException e)
{
@@ -258,13 +258,13 @@
{
checkRead();
- if (body.remaining() == 0) { return -1; }
+ if (getBody().remaining() == 0) { return -1; }
- int read = Math.min(length, body.remaining());
+ int read = Math.min(length, getBody().remaining());
if (read != 0)
{
- body.getBytes(value, 0, read);
+ getBody().getBytes(value, 0, read);
}
return read;
@@ -273,49 +273,49 @@
public void writeBoolean(final boolean value) throws JMSException
{
checkWrite();
- body.putBoolean(value);
+ getBody().putBoolean(value);
}
public void writeByte(final byte value) throws JMSException
{
checkWrite();
- body.putByte(value);
+ getBody().putByte(value);
}
public void writeShort(final short value) throws JMSException
{
checkWrite();
- body.putShort(value);
+ getBody().putShort(value);
}
public void writeChar(final char value) throws JMSException
{
checkWrite();
- body.putChar(value);
+ getBody().putChar(value);
}
public void writeInt(final int value) throws JMSException
{
checkWrite();
- body.putInt(value);
+ getBody().putInt(value);
}
public void writeLong(final long value) throws JMSException
{
checkWrite();
- body.putLong(value);
+ getBody().putLong(value);
}
public void writeFloat(final float value) throws JMSException
{
checkWrite();
- body.putFloat(value);
+ getBody().putFloat(value);
}
public void writeDouble(final double value) throws JMSException
{
checkWrite();
- body.putDouble(value);
+ getBody().putDouble(value);
}
public void writeUTF(final String value) throws JMSException
@@ -323,7 +323,7 @@
checkWrite();
try
{
- body.putUTF(value);
+ getBody().putUTF(value);
}
catch (Exception e)
{
@@ -336,14 +336,14 @@
public void writeBytes(final byte[] value) throws JMSException
{
checkWrite();
- body.putBytes(value);
+ getBody().putBytes(value);
}
public void writeBytes(final byte[] value, final int offset, final int length)
throws JMSException
{
checkWrite();
- body.putBytes(value, offset, length);
+ getBody().putBytes(value, offset, length);
}
public void writeObject(final Object value) throws JMSException
@@ -402,11 +402,11 @@
{
readOnly = true;
- body.flip();
+ getBody().flip();
}
else
{
- body.rewind();
+ getBody().rewind();
}
}
@@ -416,21 +416,19 @@
{
super.clearBody();
- body = new IoBufferWrapper(1024);
+ message.setBody(new IoBufferWrapper(1024));
}
public long getBodyLength() throws JMSException
{
checkRead();
- return body.limit();
+ return getBody().limit();
}
public void doBeforeSend() throws Exception
{
reset();
-
- message.setBody(body);
}
// Public --------------------------------------------------------
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java 2008-10-29 19:47:45 UTC (rev 5210)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java 2008-10-29 21:01:02 UTC (rev 5211)
@@ -443,7 +443,7 @@
public void doBeforeSend() throws Exception
{
- map.encode(body);
+ map.encode(message.getBody());
super.doBeforeSend();
}
@@ -452,7 +452,7 @@
{
super.doBeforeReceive();
- map.decode(body);
+ map.decode(message.getBody());
}
// Package protected ---------------------------------------------
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-10-29 19:47:45 UTC (rev 5210)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-10-29 21:01:02 UTC (rev 5211)
@@ -153,8 +153,6 @@
// The underlying message
protected ClientMessage message;
- protected MessagingBuffer body;
-
private ClientSession session;
// Read-only?
@@ -190,8 +188,6 @@
(byte)4,
new ByteBufferWrapper(ByteBuffer.allocate(1024)));
- // TODO - can we lazily create this?
- body = message.getBody();
}
public JBossMessage(byte type)
@@ -203,8 +199,6 @@
(byte)4,
new ByteBufferWrapper(ByteBuffer.allocate(1024)));
- // TODO - can we lazily create this?
- body = message.getBody();
}
/*
@@ -214,8 +208,6 @@
{
message = session.createClientMessage(type, true, 0, System.currentTimeMillis(), (byte)4);
- // TODO - can we lazily create this?
- body = message.getBody();
}
public JBossMessage(final ClientSession session)
@@ -233,8 +225,6 @@
this.readOnly = true;
this.session = session;
-
- this.body = message.getBody();
}
/*
@@ -935,14 +925,12 @@
public void doBeforeSend() throws Exception
{
- body.flip();
-
- message.setBody(body);
+ message.getBody().flip();
}
public void doBeforeReceive() throws Exception
{
- body = message.getBody();
+ message.getBody().rewind();
}
public byte getType()
@@ -984,6 +972,11 @@
throw new MessageNotReadableException("Message is write-only");
}
}
+
+ protected MessagingBuffer getBody()
+ {
+ return message.getBody();
+ }
// Private ------------------------------------------------------------
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java 2008-10-29 19:47:45 UTC (rev 5210)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java 2008-10-29 21:01:02 UTC (rev 5211)
@@ -33,6 +33,7 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.ObjectInputStreamWithClassLoader;
/**
@@ -113,8 +114,8 @@
byte[] data = baos.toByteArray();
- body.putInt(data.length);
- body.putBytes(data);
+ getBody().putInt(data.length);
+ getBody().putBytes(data);
}
super.doBeforeSend();
@@ -137,9 +138,9 @@
{
try
{
- int len = body.getInt();
+ int len = getBody().getInt();
byte[] data = new byte[len];
- body.getBytes(data);
+ getBody().getBytes(data);
ByteArrayInputStream bais = new ByteArrayInputStream(data);
ObjectInputStream ois = new ObjectInputStreamWithClassLoader(bais);
object = (Serializable)ois.readObject();
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java 2008-10-29 19:47:45 UTC (rev 5210)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java 2008-10-29 21:01:02 UTC (rev 5211)
@@ -119,14 +119,14 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.BOOLEAN:
- return body.getBoolean();
+ return getBody().getBoolean();
case DataConstants.STRING:
- String s = body.getNullableString();
+ String s = getBody().getNullableString();
return Boolean.valueOf(s);
default:
throw new MessageFormatException("Invalid conversion");
@@ -143,13 +143,13 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.BYTE:
- return body.getByte();
+ return getBody().getByte();
case DataConstants.STRING:
- String s = body.getNullableString();
+ String s = getBody().getNullableString();
return Byte.parseByte(s);
default:
throw new MessageFormatException("Invalid conversion");
@@ -166,15 +166,15 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.BYTE:
- return body.getByte();
+ return getBody().getByte();
case DataConstants.SHORT:
- return body.getShort();
+ return getBody().getShort();
case DataConstants.STRING:
- String s = body.getNullableString();
+ String s = getBody().getNullableString();
return Short.parseShort(s);
default:
throw new MessageFormatException("Invalid conversion");
@@ -191,11 +191,11 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.CHAR:
- return body.getChar();
+ return getBody().getChar();
default:
throw new MessageFormatException("Invalid conversion");
}
@@ -211,17 +211,17 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.BYTE:
- return body.getByte();
+ return getBody().getByte();
case DataConstants.SHORT:
- return body.getShort();
+ return getBody().getShort();
case DataConstants.INT:
- return body.getInt();
+ return getBody().getInt();
case DataConstants.STRING:
- String s = body.getNullableString();
+ String s = getBody().getNullableString();
return Integer.parseInt(s);
default:
throw new MessageFormatException("Invalid conversion");
@@ -238,19 +238,19 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.BYTE:
- return body.getByte();
+ return getBody().getByte();
case DataConstants.SHORT:
- return body.getShort();
+ return getBody().getShort();
case DataConstants.INT:
- return body.getInt();
+ return getBody().getInt();
case DataConstants.LONG:
- return body.getLong();
+ return getBody().getLong();
case DataConstants.STRING:
- String s = body.getNullableString();
+ String s = getBody().getNullableString();
return Long.parseLong(s);
default:
throw new MessageFormatException("Invalid conversion");
@@ -267,13 +267,13 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.FLOAT:
- return body.getFloat();
+ return getBody().getFloat();
case DataConstants.STRING:
- String s = body.getNullableString();
+ String s = getBody().getNullableString();
return Float.parseFloat(s);
default:
throw new MessageFormatException("Invalid conversion");
@@ -290,15 +290,15 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.FLOAT:
- return body.getFloat();
+ return getBody().getFloat();
case DataConstants.DOUBLE:
- return body.getDouble();
+ return getBody().getDouble();
case DataConstants.STRING:
- String s = body.getNullableString();
+ String s = getBody().getNullableString();
return Double.parseDouble(s);
default:
throw new MessageFormatException("Invalid conversion: " + type);
@@ -315,27 +315,27 @@
checkRead();
try
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.BOOLEAN:
- return String.valueOf(body.getBoolean());
+ return String.valueOf(getBody().getBoolean());
case DataConstants.BYTE:
- return String.valueOf(body.getByte());
+ return String.valueOf(getBody().getByte());
case DataConstants.SHORT:
- return String.valueOf(body.getShort());
+ return String.valueOf(getBody().getShort());
case DataConstants.CHAR:
- return String.valueOf(body.getChar());
+ return String.valueOf(getBody().getChar());
case DataConstants.INT:
- return String.valueOf(body.getInt());
+ return String.valueOf(getBody().getInt());
case DataConstants.LONG:
- return String.valueOf(body.getLong());
+ return String.valueOf(getBody().getLong());
case DataConstants.FLOAT:
- return String.valueOf(body.getFloat());
+ return String.valueOf(getBody().getFloat());
case DataConstants.DOUBLE:
- return String.valueOf(body.getDouble());
+ return String.valueOf(getBody().getDouble());
case DataConstants.STRING:
- return body.getNullableString();
+ return getBody().getNullableString();
default:
throw new MessageFormatException("Invalid conversion");
}
@@ -360,15 +360,15 @@
}
else if (len == 0)
{
- byte type = body.getByte();
+ byte type = getBody().getByte();
if (type != DataConstants.BYTES)
{
throw new MessageFormatException("Invalid conversion");
}
- len = body.getInt();
+ len = getBody().getInt();
}
int read = Math.min(value.length, len);
- body.getBytes(value, 0, read);
+ getBody().getBytes(value, 0, read);
len -= read;
if (len == 0)
{
@@ -385,31 +385,31 @@
public Object readObject() throws JMSException
{
checkRead();
- byte type = body.getByte();
+ byte type = getBody().getByte();
switch (type)
{
case DataConstants.BOOLEAN:
- return body.getBoolean();
+ return getBody().getBoolean();
case DataConstants.BYTE:
- return body.getByte();
+ return getBody().getByte();
case DataConstants.SHORT:
- return body.getShort();
+ return getBody().getShort();
case DataConstants.CHAR:
- return body.getChar();
+ return getBody().getChar();
case DataConstants.INT:
- return body.getInt();
+ return getBody().getInt();
case DataConstants.LONG:
- return body.getLong();
+ return getBody().getLong();
case DataConstants.FLOAT:
- return body.getFloat();
+ return getBody().getFloat();
case DataConstants.DOUBLE:
- return body.getDouble();
+ return getBody().getDouble();
case DataConstants.STRING:
- return body.getNullableString();
+ return getBody().getNullableString();
case DataConstants.BYTES:
- int len = body.getInt();
+ int len = getBody().getInt();
byte[] bytes = new byte[len];
- body.getBytes(bytes);
+ getBody().getBytes(bytes);
return bytes;
default:
throw new MessageFormatException("Invalid conversion");
@@ -419,81 +419,81 @@
public void writeBoolean(final boolean value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.BOOLEAN);
- body.putBoolean(value);
+ getBody().putByte(DataConstants.BOOLEAN);
+ getBody().putBoolean(value);
}
public void writeByte(final byte value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.BYTE);
- body.putByte(value);
+ getBody().putByte(DataConstants.BYTE);
+ getBody().putByte(value);
}
public void writeShort(final short value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.SHORT);
- body.putShort(value);
+ getBody().putByte(DataConstants.SHORT);
+ getBody().putShort(value);
}
public void writeChar(final char value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.CHAR);
- body.putChar(value);
+ getBody().putByte(DataConstants.CHAR);
+ getBody().putChar(value);
}
public void writeInt(final int value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.INT);
- body.putInt(value);
+ getBody().putByte(DataConstants.INT);
+ getBody().putInt(value);
}
public void writeLong(final long value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.LONG);
- body.putLong(value);
+ getBody().putByte(DataConstants.LONG);
+ getBody().putLong(value);
}
public void writeFloat(final float value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.FLOAT);
- body.putFloat(value);
+ getBody().putByte(DataConstants.FLOAT);
+ getBody().putFloat(value);
}
public void writeDouble(final double value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.DOUBLE);
- body.putDouble(value);
+ getBody().putByte(DataConstants.DOUBLE);
+ getBody().putDouble(value);
}
public void writeString(final String value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.STRING);
- body.putNullableString(value);
+ getBody().putByte(DataConstants.STRING);
+ getBody().putNullableString(value);
}
public void writeBytes(final byte[] value) throws JMSException
{
checkWrite();
- body.putByte(DataConstants.BYTES);
- body.putInt(value.length);
- body.putBytes(value);
+ getBody().putByte(DataConstants.BYTES);
+ getBody().putInt(value.length);
+ getBody().putBytes(value);
}
public void writeBytes(final byte[] value, final int offset, final int length)
throws JMSException
{
checkWrite();
- body.putByte(DataConstants.BYTES);
- body.putInt(length);
- body.putBytes(value, offset, length);
+ getBody().putByte(DataConstants.BYTES);
+ getBody().putInt(length);
+ getBody().putBytes(value, offset, length);
}
public void writeObject(final Object value) throws JMSException
@@ -554,11 +554,11 @@
{
readOnly = true;
- body.flip();
+ getBody().flip();
}
else
{
- body.rewind();
+ getBody().rewind();
}
}
@@ -567,15 +567,13 @@
public void clearBody() throws JMSException
{
super.clearBody();
-
- body = new IoBufferWrapper(1024);
+
+ message.setBody(new IoBufferWrapper(1024));
}
public void doBeforeSend() throws Exception
{
reset();
-
- message.setBody(body);
}
// Package protected ---------------------------------------------
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java 2008-10-29 19:47:45 UTC (rev 5210)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java 2008-10-29 21:01:02 UTC (rev 5211)
@@ -124,7 +124,7 @@
public void doBeforeSend() throws Exception
{
- body.putNullableString(text);
+ getBody().putNullableString(text);
super.doBeforeSend();
}
@@ -133,7 +133,7 @@
{
super.doBeforeReceive();
- text = body.getNullableString();
+ text = getBody().getNullableString();
}
// Package protected ---------------------------------------------
Modified: branches/Branch_Chunk_CRS2/tests/jms-tests/src/org/jboss/test/messaging/jms/String64KLimitTest.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/jms-tests/src/org/jboss/test/messaging/jms/String64KLimitTest.java 2008-10-29 19:47:45 UTC (rev 5210)
+++ branches/Branch_Chunk_CRS2/tests/jms-tests/src/org/jboss/test/messaging/jms/String64KLimitTest.java 2008-10-29 21:01:02 UTC (rev 5211)
@@ -21,7 +21,14 @@
*/
package org.jboss.test.messaging.jms;
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
/**
*
* There is a bug in JDK1.3, 1.4 whereby writeUTF fails if more than 64K bytes are written
@@ -64,169 +71,163 @@
return new String(chars);
}
- //Tests commented out until message chunking is complete
- //See http://jira.jboss.org/jira/browse/JBMESSAGING-379
- public void testFoo() throws Exception
- {
+ public void test64KLimitWithTextMessage() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+
+ Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageProducer prod = sess.createProducer(queue1);
+
+ MessageConsumer cons = sess.createConsumer(queue1);
+
+ conn.start();
+
+ String s1 = genString(16 * 1024);
+
+ String s2 = genString(32 * 1024);
+
+ String s3 = genString(64 * 1024);
+
+ String s4 = genString(10 * 64 * 1024);
+
+ TextMessage tm1 = sess.createTextMessage(s1);
+
+ TextMessage tm2 = sess.createTextMessage(s2);
+
+ TextMessage tm3 = sess.createTextMessage(s3);
+
+ TextMessage tm4 = sess.createTextMessage(s4);
+
+ prod.send(tm1);
+
+ prod.send(tm2);
+
+ prod.send(tm3);
+
+ prod.send(tm4);
+
+ TextMessage rm1 = (TextMessage)cons.receive(60000);
+
+ assertNotNull(rm1);
+
+ TextMessage rm2 = (TextMessage)cons.receive(60000);
+
+ assertNotNull(rm2);
+
+ TextMessage rm3 = (TextMessage)cons.receive(60000);
+
+ assertNotNull(rm3);
+
+ TextMessage rm4 = (TextMessage)cons.receive(60000);
+
+ assertNotNull(rm4);
+
+ assertEquals(s1.length(), rm1.getText().length());
+
+ assertEquals(s1, rm1.getText());
+
+ assertEquals(s2.length(), rm2.getText().length());
+
+ assertEquals(s2, rm2.getText());
+
+ assertEquals(s3.length(), rm3.getText().length());
+
+ assertEquals(s3, rm3.getText());
+
+ assertEquals(s4.length(), rm4.getText().length());
+
+ assertEquals(s4, rm4.getText());
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
}
+
+ public void test64KLimitWithObjectMessage() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
-// public void test64KLimitWithTextMessage() throws Exception
-// {
-// Connection conn = null;
-//
-// try
-// {
-// conn = cf.createConnection();
-//
-// Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-// MessageProducer prod = sess.createProducer(queue1);
-//
-// MessageConsumer cons = sess.createConsumer(queue1);
-//
-// conn.start();
-//
-// String s1 = genString(16 * 1024);
-//
-// String s2 = genString(32 * 1024);
-//
-// String s3 = genString(64 * 1024);
-//
-// String s4 = genString(10 * 64 * 1024);
-//
-// TextMessage tm1 = sess.createTextMessage(s1);
-//
-// TextMessage tm2 = sess.createTextMessage(s2);
-//
-// TextMessage tm3 = sess.createTextMessage(s3);
-//
-// TextMessage tm4 = sess.createTextMessage(s4);
-//
-// prod.send(tm1);
-//
-// prod.send(tm2);
-//
-// prod.send(tm3);
-//
-// prod.send(tm4);
-//
-// TextMessage rm1 = (TextMessage)cons.receive(1000);
-//
-// assertNotNull(rm1);
-//
-// TextMessage rm2 = (TextMessage)cons.receive(1000);
-//
-// assertNotNull(rm2);
-//
-// TextMessage rm3 = (TextMessage)cons.receive(1000);
-//
-// assertNotNull(rm3);
-//
-// TextMessage rm4 = (TextMessage)cons.receive(1000);
-//
-// assertNotNull(rm4);
-//
-// assertEquals(s1.length(), rm1.getText().length());
-//
-// assertEquals(s1, rm1.getText());
-//
-// assertEquals(s2.length(), rm2.getText().length());
-//
-// assertEquals(s2, rm2.getText());
-//
-// assertEquals(s3.length(), rm3.getText().length());
-//
-// assertEquals(s3, rm3.getText());
-//
-// assertEquals(s4.length(), rm4.getText().length());
-//
-// assertEquals(s4, rm4.getText());
-// }
-// finally
-// {
-// if (conn != null)
-// {
-// conn.close();
-// }
-// }
-// }
-//
-// public void test64KLimitWithObjectMessage() throws Exception
-// {
-// Connection conn = null;
-//
-// try
-// {
-// conn = cf.createConnection();
-//
-// Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-// MessageProducer prod = sess.createProducer(queue1);
-//
-// MessageConsumer cons = sess.createConsumer(queue1);
-//
-// conn.start();
-//
-// String s1 = genString(16 * 1024);
-//
-// String s2 = genString(32 * 1024);
-//
-// String s3 = genString(64 * 1024);
-//
-// String s4 = genString(10 * 64 * 1024);
-//
-// ObjectMessage om1 = sess.createObjectMessage();
-//
-// om1.setObject(s1);
-//
-// ObjectMessage om2 = sess.createObjectMessage();
-//
-// om2.setObject(s2);
-//
-// ObjectMessage om3 = sess.createObjectMessage();
-//
-// om3.setObject(s3);
-//
-// ObjectMessage om4 = sess.createObjectMessage();
-//
-// om4.setObject(s4);
-//
-// prod.send(om1);
-//
-// prod.send(om2);
-//
-// prod.send(om3);
-//
-// prod.send(om4);
-//
-// ObjectMessage rm1 = (ObjectMessage)cons.receive(1000);
-//
-// assertNotNull(rm1);
-//
-// ObjectMessage rm2 = (ObjectMessage)cons.receive(1000);
-//
-// assertNotNull(rm2);
-//
-// ObjectMessage rm3 = (ObjectMessage)cons.receive(1000);
-//
-// assertNotNull(rm3);
-//
-// ObjectMessage rm4 = (ObjectMessage)cons.receive(1000);
-//
-// assertNotNull(rm4);
-//
-// assertEquals(s1, rm1.getObject());
-//
-// assertEquals(s2, rm2.getObject());
-//
-// assertEquals(s3, rm3.getObject());
-//
-// assertEquals(s4, rm4.getObject());
-// }
-// finally
-// {
-// conn.close();
-// }
-// }
+ Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageProducer prod = sess.createProducer(queue1);
+
+ MessageConsumer cons = sess.createConsumer(queue1);
+
+ conn.start();
+
+ String s1 = genString(16 * 1024);
+
+ String s2 = genString(32 * 1024);
+
+ String s3 = genString(64 * 1024);
+
+ String s4 = genString(10 * 64 * 1024);
+
+ ObjectMessage om1 = sess.createObjectMessage();
+
+ om1.setObject(s1);
+
+ ObjectMessage om2 = sess.createObjectMessage();
+
+ om2.setObject(s2);
+
+ ObjectMessage om3 = sess.createObjectMessage();
+
+ om3.setObject(s3);
+
+ ObjectMessage om4 = sess.createObjectMessage();
+
+ om4.setObject(s4);
+
+ prod.send(om1);
+
+ prod.send(om2);
+
+ prod.send(om3);
+
+ prod.send(om4);
+
+ ObjectMessage rm1 = (ObjectMessage)cons.receive(1000);
+
+ assertNotNull(rm1);
+
+ ObjectMessage rm2 = (ObjectMessage)cons.receive(1000);
+
+ assertNotNull(rm2);
+
+ ObjectMessage rm3 = (ObjectMessage)cons.receive(1000);
+
+ assertNotNull(rm3);
+
+ ObjectMessage rm4 = (ObjectMessage)cons.receive(1000);
+
+ assertNotNull(rm4);
+
+ assertEquals(s1, rm1.getObject());
+
+ assertEquals(s2, rm2.getObject());
+
+ assertEquals(s3, rm3.getObject());
+
+ assertEquals(s4, rm4.getObject());
+ }
+ finally
+ {
+ conn.close();
+ }
+ }
}
More information about the jboss-cvs-commits
mailing list