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

ARTEMIS-4309 Read all bytes of compressed objmsg 

Continually read from the compressed byte[] into
the decompressed object

Add test to validate large (>1024 bytes) compressed data can be
deserialized properly
This commit is contained in:
Peter Brady 2023-05-28 09:39:06 -04:00 committed by clebertsuconic
parent c96a074b53
commit 2f5463c960
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
View File

@ -267,7 +267,7 @@ public final class OpenWireMessageConverter {
int n = ois.read(buf); int n = ois.read(buf);
while (n != -1) { while (n != -1) {
decompressed.write(buf, 0, n); decompressed.write(buf, 0, n);
n = ois.read(); n = ois.read(buf);
} }
//read done //read done
return decompressed.toByteSequence(); return decompressed.toByteSequence();

23
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java
View File

@ -38,6 +38,7 @@ import org.junit.Test;
public class CompressedInteropTest extends BasicOpenWireTest { public class CompressedInteropTest extends BasicOpenWireTest {
private static final String TEXT; private static final String TEXT;
private static final String LARGE_TEXT;
static { static {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
@ -46,6 +47,7 @@ public class CompressedInteropTest extends BasicOpenWireTest {
builder.append("The quick red fox jumped over the lazy brown dog. "); builder.append("The quick red fox jumped over the lazy brown dog. ");
} }
TEXT = builder.toString(); TEXT = builder.toString();
LARGE_TEXT = TEXT + TEXT + TEXT + TEXT + TEXT;
} }
@Before @Before
@ -90,6 +92,9 @@ public class CompressedInteropTest extends BasicOpenWireTest {
//ObjectMessage //ObjectMessage
sendCompressedObjectMessageUsingOpenWire(); sendCompressedObjectMessageUsingOpenWire();
receiveObjectMessage(useCore); receiveObjectMessage(useCore);
//Large ObjectMessage
sendCompressedLargeObjectMessageUsingOpenWire();
receiveLargeObjectMessage(useCore);
} }
private void sendCompressedStreamMessageUsingOpenWire() throws Exception { private void sendCompressedStreamMessageUsingOpenWire() throws Exception {
@ -164,6 +169,24 @@ public class CompressedInteropTest extends BasicOpenWireTest {
assertEquals(TEXT, objectVal); assertEquals(TEXT, objectVal);
} }
private void sendCompressedLargeObjectMessageUsingOpenWire() throws Exception {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
ActiveMQDestination destination = createDestination(session, ActiveMQDestination.QUEUE_TYPE);
final ActiveMQMessageProducer producer = (ActiveMQMessageProducer) session.createProducer(destination);
ObjectMessage objectMessage = session.createObjectMessage();
objectMessage.setObject(LARGE_TEXT);
producer.send(objectMessage);
}
private void receiveLargeObjectMessage(boolean useCore) throws Exception {
ObjectMessage objectMessage = (ObjectMessage) receiveMessage(useCore);
Object objectVal = objectMessage.getObject();
assertEquals(LARGE_TEXT, objectVal);
}
private void sendCompressedMapMessageUsingOpenWire() throws Exception { private void sendCompressedMapMessageUsingOpenWire() throws Exception {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
ActiveMQDestination destination = createDestination(session, ActiveMQDestination.QUEUE_TYPE); ActiveMQDestination destination = createDestination(session, ActiveMQDestination.QUEUE_TYPE);