You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2022/07/07 19:07:19 UTC
[qpid-jms] branch main updated: QPIDJMS-572 Ensure that readable buffer string read consumes the bytes
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
The following commit(s) were added to refs/heads/main by this push:
new f7564d55 QPIDJMS-572 Ensure that readable buffer string read consumes the bytes
f7564d55 is described below
commit f7564d558dfc364284b1bd099242d044d422514c
Author: Timothy Bish <ta...@gmail.com>
AuthorDate: Thu Jul 7 15:06:52 2022 -0400
QPIDJMS-572 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.
---
.../org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java | 4 ++--
.../apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java
index 6ae43bbf..828fd18f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBuffer.java
@@ -209,11 +209,11 @@ public class AmqpReadableBuffer implements ReadableBuffer {
@Override
public String readUTF8() throws CharacterCodingException {
- return buffer.toString(StandardCharsets.UTF_8);
+ return buffer.readCharSequence(buffer.readableBytes(), StandardCharsets.UTF_8).toString();
}
@Override
public String readString(CharsetDecoder decoder) throws CharacterCodingException {
- return buffer.toString(StandardCharsets.UTF_8);
+ return buffer.readCharSequence(buffer.readableBytes(), decoder.charset()).toString();
}
}
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java
index fc5c99f3..3eaa130d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpReadableBufferTest.java
@@ -444,6 +444,7 @@ public class AmqpReadableBufferTest {
AmqpReadableBuffer buffer = new AmqpReadableBuffer(byteBuffer);
assertEquals(testString, buffer.readUTF8());
+ assertFalse(buffer.hasRemaining());
}
@Test
@@ -455,5 +456,6 @@ public class AmqpReadableBufferTest {
AmqpReadableBuffer buffer = new AmqpReadableBuffer(byteBuffer);
assertEquals(testString, buffer.readString(StandardCharsets.UTF_8.newDecoder()));
+ assertFalse(buffer.hasRemaining());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org