You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/04/23 11:17:37 UTC
qpid-jms git commit: QPIDJMS-381: update to proton-j 0.27.0
Repository: qpid-jms
Updated Branches:
refs/heads/master a4fa85a02 -> 94c2ba55d
QPIDJMS-381: update to proton-j 0.27.0
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/94c2ba55
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/94c2ba55
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/94c2ba55
Branch: refs/heads/master
Commit: 94c2ba55d255ee08649d7cdd810091b651e44684
Parents: a4fa85a
Author: Robbie Gemmell <ro...@apache.org>
Authored: Mon Apr 23 12:17:05 2018 +0100
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Mon Apr 23 12:17:05 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
qpid-jms-client/pom.xml | 2 +-
.../amqp/message/AmqpWritableBuffer.java | 6 ++++
.../amqp/message/AmqpWritableBufferTest.java | 31 ++++++++++++++++++++
4 files changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94c2ba55/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4e83a3b..d4a9948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Dependency Versions for this Project -->
- <proton-version>0.26.0</proton-version>
+ <proton-version>0.27.0</proton-version>
<netty-version>4.1.23.Final</netty-version>
<slf4j-version>1.7.25</slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94c2ba55/qpid-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index 9e88b5d..0c81bf9 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -131,7 +131,7 @@
<Export-Package>org.apache.qpid.jms.*</Export-Package>
<Import-Package>
io.netty.*;version="[4.1.0,4.2.0)",
- org.apache.qpid.proton.*;version="[0.26.0,0.27.0)",
+ org.apache.qpid.proton.*;version="[0.27.0,0.28.0)",
*</Import-Package>
<Dynamic-ImportPackage>*</Dynamic-ImportPackage>
</instructions>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94c2ba55/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBuffer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBuffer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBuffer.java
index 5e74cf6..77bb253 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBuffer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBuffer.java
@@ -18,6 +18,7 @@ package org.apache.qpid.jms.provider.amqp.message;
import java.nio.ByteBuffer;
+import org.apache.qpid.proton.codec.ReadableBuffer;
import org.apache.qpid.proton.codec.WritableBuffer;
import io.netty.buffer.ByteBuf;
@@ -112,4 +113,9 @@ public class AmqpWritableBuffer implements WritableBuffer {
public int limit() {
return nettyBuffer.capacity();
}
+
+ @Override
+ public void put(ReadableBuffer buffer) {
+ buffer.get(this);
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94c2ba55/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBufferTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBufferTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBufferTest.java
index 992d628..981556d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBufferTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpWritableBufferTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.nio.ByteBuffer;
+import org.apache.qpid.proton.codec.ReadableBuffer;
import org.junit.Test;
import io.netty.buffer.ByteBuf;
@@ -117,4 +118,34 @@ public class AmqpWritableBufferTest {
writable.put(input);
assertEquals(1, writable.position());
}
+
+ @Test
+ public void testPutReadableBuffer() {
+ doPutReadableBufferTestImpl(true);
+ doPutReadableBufferTestImpl(false);
+ }
+
+ private void doPutReadableBufferTestImpl(boolean readOnly) {
+ ByteBuffer buf = ByteBuffer.allocate(1024);
+ buf.put((byte) 1);
+ buf.flip();
+ if(readOnly) {
+ buf = buf.asReadOnlyBuffer();
+ }
+
+ ReadableBuffer input = new ReadableBuffer.ByteBufferReader(buf);
+
+ if(readOnly) {
+ assertFalse("Expected buffer not to hasArray()", input.hasArray());
+ } else {
+ assertTrue("Expected buffer to hasArray()", input.hasArray());
+ }
+
+ ByteBuf buffer = Unpooled.buffer(1024);
+ AmqpWritableBuffer writable = new AmqpWritableBuffer(buffer);
+
+ assertEquals(0, writable.position());
+ writable.put(input);
+ assertEquals(1, writable.position());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org