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

ARTEMIS-3990 Ensure that readable buffer string read consumes the bytes 

Ensures that when reading a string the readable buffer consumes the
bytes by advancing the read index as defined in the interface API docs.
This commit is contained in:
Timothy Bish 2022-09-13 16:21:34 -04:00 committed by clebertsuconic
parent 902c0cb62b
commit 289587f004
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/util/NettyReadable.java
View File

@ -145,7 +145,7 @@ public class NettyReadable implements ReadableBuffer {
@Override
public String readUTF8() {
return buffer.toString(Charset_UTF8);
return buffer.readCharSequence(buffer.readableBytes(), Charset_UTF8).toString();
}
@Override
@ -192,7 +192,7 @@ public class NettyReadable implements ReadableBuffer {
@Override
public String readString(CharsetDecoder decoder) throws CharacterCodingException {
return buffer.toString(decoder.charset());
return buffer.readCharSequence(buffer.readableBytes(), decoder.charset()).toString();
}
@Override

4
artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/util/NettyReadableTest.java
View File

@ -438,7 +438,9 @@ public class NettyReadableTest {
NettyReadable buffer = new NettyReadable(byteBuffer);
assertEquals(asUtf8bytes.length, buffer.remaining());
assertEquals(testString, buffer.readUTF8());
assertEquals(0, buffer.remaining());
}
@Test
@ -449,6 +451,8 @@ public class NettyReadableTest {
NettyReadable buffer = new NettyReadable(byteBuffer);
assertEquals(asUtf8bytes.length, buffer.remaining());
assertEquals(testString, buffer.readString(StandardCharsets.UTF_8.newDecoder()));
assertEquals(0, buffer.remaining());
}
}