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

ARTEMIS-1504 Update Qpid JMS to 0.30.0 and proton-j to 0.26.0 

Updates to latest Qpid JMS and the latest Proton-J release
This commit is contained in:
Timothy Bish 2018-03-01 19:12:36 -05:00 committed by Clebert Suconic
parent 005e9d67d0
commit 79674ca5db
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
View File

@ -16,7 +16,6 @@
*/ */
package org.apache.activemq.artemis.protocol.amqp.proton.handler; package org.apache.activemq.artemis.protocol.amqp.proton.handler;
import javax.security.auth.Subject;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -26,6 +25,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import javax.security.auth.Subject;
import org.apache.activemq.artemis.protocol.amqp.proton.ProtonInitializable; import org.apache.activemq.artemis.protocol.amqp.proton.ProtonInitializable;
import org.apache.activemq.artemis.protocol.amqp.sasl.ClientSASL; import org.apache.activemq.artemis.protocol.amqp.sasl.ClientSASL;
import org.apache.activemq.artemis.protocol.amqp.sasl.SASLResult; import org.apache.activemq.artemis.protocol.amqp.sasl.SASLResult;
@ -42,6 +43,7 @@ import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Event; import org.apache.qpid.proton.engine.Event;
import org.apache.qpid.proton.engine.Sasl; import org.apache.qpid.proton.engine.Sasl;
import org.apache.qpid.proton.engine.Transport; import org.apache.qpid.proton.engine.Transport;
import org.apache.qpid.proton.engine.impl.TransportInternal;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
@ -93,6 +95,14 @@ public class ProtonHandler extends ProtonInitializable {
}); });
this.creationTime = System.currentTimeMillis(); this.creationTime = System.currentTimeMillis();
this.isServer = isServer; this.isServer = isServer;
try {
((TransportInternal) transport).setUseReadOnlyOutputBuffer(false);
} catch (NoSuchMethodError nsme) {
// using a version at runtime where the optimization isn't available, ignore
log.trace("Proton output buffer optimisation unavailable");
}
transport.bind(connection); transport.bind(connection);
connection.collect(collector); connection.collect(collector);
} }

4
pom.xml
View File

@ -92,10 +92,10 @@
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version> <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>2.8.47</mockito.version> <mockito.version>2.8.47</mockito.version>
<netty.version>4.1.19.Final</netty.version> <netty.version>4.1.19.Final</netty.version>
<proton.version>0.25.0</proton.version> <proton.version>0.26.0</proton.version>
<resteasy.version>3.0.19.Final</resteasy.version> <resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
<qpid.jms.version>0.29.0</qpid.jms.version> <qpid.jms.version>0.30.0</qpid.jms.version>
<johnzon.version>0.9.5</johnzon.version> <johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version> <json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version> <javax.inject.version>1</javax.inject.version>