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

AMQ-6909 Update Qpid JMS, proton-j and Netty to latest. 

Use latest releases of AMQP deps
(cherry picked from commit b29d2ea342)
This commit is contained in:
Timothy Bish 2018-05-08 17:44:55 -04:00
parent 2eafc39171
commit 0e30927836
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AmqpWritableBuffer.java
View File

@ -18,11 +18,9 @@ package org.apache.activemq.transport.amqp.message;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.apache.qpid.proton.codec.ReadableBuffer;
import org.apache.qpid.proton.codec.WritableBuffer; import org.apache.qpid.proton.codec.WritableBuffer;
/**
*
*/
public class AmqpWritableBuffer implements WritableBuffer { public class AmqpWritableBuffer implements WritableBuffer {
public final static int DEFAULT_CAPACITY = 4 * 1024; public final static int DEFAULT_CAPACITY = 4 * 1024;
@ -148,6 +146,12 @@ public class AmqpWritableBuffer implements WritableBuffer {
return Integer.MAX_VALUE; 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. * Ensures the the buffer has at least the minimumCapacity specified.
* *

6
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
View File

@ -171,6 +171,11 @@ public class AmqpConnection implements AmqpProtocolConverter {
int maxFrameSize = amqpWireFormat.getMaxAmqpFrameSize(); int maxFrameSize = amqpWireFormat.getMaxAmqpFrameSize();
if (maxFrameSize > AmqpWireFormat.NO_AMQP_MAX_FRAME_SIZE) { if (maxFrameSize > AmqpWireFormat.NO_AMQP_MAX_FRAME_SIZE) {
this.protonTransport.setMaxFrameSize(maxFrameSize); this.protonTransport.setMaxFrameSize(maxFrameSize);
try {
this.protonTransport.setOutboundFrameSizeLimit(maxFrameSize);
} catch (Throwable e) {
// Ignore if older proton-j was injected.
}
} }
this.protonTransport.bind(this.protonConnection); this.protonTransport.bind(this.protonConnection);
@ -328,6 +333,7 @@ public class AmqpConnection implements AmqpProtocolConverter {
} }
} }
@SuppressWarnings("deprecation")
@Override @Override
public void onAMQPData(Object command) throws Exception { public void onAMQPData(Object command) throws Exception {
Buffer frame; Buffer frame;

10
pom.xml
View File

@ -103,11 +103,11 @@
<p2psockets-version>1.1.2</p2psockets-version> <p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version> <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.6</zookeeper-version> <zookeeper-version>3.4.6</zookeeper-version>
<qpid-proton-version>0.26.0</qpid-proton-version> <qpid-proton-version>0.27.1</qpid-proton-version>
<qpid-jms-version>0.30.0</qpid-jms-version> <qpid-jms-version>0.32.0</qpid-jms-version>
<qpid-jms-netty-version>4.1.22.Final</qpid-jms-netty-version> <qpid-jms-netty-version>4.1.24.Final</qpid-jms-netty-version>
<qpid-jms-proton-version>0.26.0</qpid-jms-proton-version> <qpid-jms-proton-version>0.27.1</qpid-jms-proton-version>
<netty-all-version>4.1.22.Final</netty-all-version> <netty-all-version>4.1.24.Final</netty-all-version>
<regexp-version>1.3</regexp-version> <regexp-version>1.3</regexp-version>
<rome-version>1.0</rome-version> <rome-version>1.0</rome-version>
<saxon-version>9.5.1-5</saxon-version> <saxon-version>9.5.1-5</saxon-version>