You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2018/05/08 21:45:09 UTC
activemq git commit: AMQ-6909 Update Qpid JMS,
proton-j and Netty to latest.
Repository: activemq
Updated Branches:
refs/heads/master c37dea84a -> b29d2ea34
AMQ-6909 Update Qpid JMS, proton-j and Netty to latest.
Use latest releases of AMQP deps
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b29d2ea3
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b29d2ea3
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b29d2ea3
Branch: refs/heads/master
Commit: b29d2ea34275ce5cb4d2653ff1edda9dad454763
Parents: c37dea8
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue May 8 17:44:55 2018 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue May 8 17:44:55 2018 -0400
----------------------------------------------------------------------
.../transport/amqp/message/AmqpWritableBuffer.java | 10 +++++++---
.../activemq/transport/amqp/protocol/AmqpConnection.java | 6 ++++++
pom.xml | 10 +++++-----
3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b29d2ea3/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpWritableBuffer.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpWritableBuffer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpWritableBuffer.java
index 399eb3f..ba6a773 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpWritableBuffer.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpWritableBuffer.java
@@ -18,11 +18,9 @@ package org.apache.activemq.transport.amqp.message;
import java.nio.ByteBuffer;
+import org.apache.qpid.proton.codec.ReadableBuffer;
import org.apache.qpid.proton.codec.WritableBuffer;
-/**
- *
- */
public class AmqpWritableBuffer implements WritableBuffer {
public final static int DEFAULT_CAPACITY = 4 * 1024;
@@ -148,6 +146,12 @@ public class AmqpWritableBuffer implements WritableBuffer {
return Integer.MAX_VALUE;
}
+ @Override
+ public void put(ReadableBuffer src) {
+ ensureCapacity(position);
+ src.get(this);
+ }
+
/**
* Ensures the the buffer has at least the minimumCapacity specified.
*
http://git-wip-us.apache.org/repos/asf/activemq/blob/b29d2ea3/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
index dec1bc9..39f7bff 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
@@ -171,6 +171,11 @@ public class AmqpConnection implements AmqpProtocolConverter {
int maxFrameSize = amqpWireFormat.getMaxAmqpFrameSize();
if (maxFrameSize > AmqpWireFormat.NO_AMQP_MAX_FRAME_SIZE) {
this.protonTransport.setMaxFrameSize(maxFrameSize);
+ try {
+ this.protonTransport.setOutboundFrameSizeLimit(maxFrameSize);
+ } catch (Throwable e) {
+ // Ignore if older proton-j was injected.
+ }
}
this.protonTransport.bind(this.protonConnection);
@@ -328,6 +333,7 @@ public class AmqpConnection implements AmqpProtocolConverter {
}
}
+ @SuppressWarnings("deprecation")
@Override
public void onAMQPData(Object command) throws Exception {
Buffer frame;
http://git-wip-us.apache.org/repos/asf/activemq/blob/b29d2ea3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 30d3fd5..d7991ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,11 +103,11 @@
<p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.6</zookeeper-version>
- <qpid-proton-version>0.26.0</qpid-proton-version>
- <qpid-jms-version>0.30.0</qpid-jms-version>
- <qpid-jms-netty-version>4.1.22.Final</qpid-jms-netty-version>
- <qpid-jms-proton-version>0.26.0</qpid-jms-proton-version>
- <netty-all-version>4.1.22.Final</netty-all-version>
+ <qpid-proton-version>0.27.1</qpid-proton-version>
+ <qpid-jms-version>0.32.0</qpid-jms-version>
+ <qpid-jms-netty-version>4.1.24.Final</qpid-jms-netty-version>
+ <qpid-jms-proton-version>0.27.1</qpid-jms-proton-version>
+ <netty-all-version>4.1.24.Final</netty-all-version>
<regexp-version>1.3</regexp-version>
<rome-version>1.0</rome-version>
<saxon-version>9.5.1-5</saxon-version>