Repository: qpid-jms Updated Branches: refs/heads/master 7f0fd7962 -> 43fded8b0
QPIDJMS-363: update to proton-j 0.26.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/43fded8b Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/43fded8b Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/43fded8b Branch: refs/heads/master Commit: 43fded8b0c349020211b1ffdd79f9108d6e9679f Parents: 7f0fd79 Author: Robbie Gemmell <[email protected]> Authored: Mon Feb 26 09:23:24 2018 +0000 Committer: Robbie Gemmell <[email protected]> Committed: Mon Feb 26 09:23:24 2018 +0000 ---------------------------------------------------------------------- pom.xml | 2 +- qpid-jms-client/pom.xml | 2 +- .../java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/43fded8b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6cf3bb8..0a06dcb 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.25.0</proton-version> + <proton-version>0.26.0</proton-version> <netty-version>4.1.22.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/43fded8b/qpid-jms-client/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml index 1b7cefc..974850e 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.25.0,0.26.0)", + org.apache.qpid.proton.*;version="[0.26.0,0.27.0)", *</Import-Package> <Dynamic-ImportPackage>*</Dynamic-ImportPackage> </instructions> http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/43fded8b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java index 3432bd2..05c347d 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java @@ -80,6 +80,7 @@ import org.apache.qpid.proton.engine.SaslListener; import org.apache.qpid.proton.engine.impl.CollectorImpl; import org.apache.qpid.proton.engine.impl.ProtocolTracer; import org.apache.qpid.proton.engine.impl.TransportImpl; +import org.apache.qpid.proton.engine.impl.TransportInternal; import org.apache.qpid.proton.framing.TransportFrame; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -179,6 +180,13 @@ public class AmqpProvider implements Provider, TransportListener , AmqpResourceP try { protonTransport.setEmitFlowEventOnSend(false); + try { + ((TransportInternal) protonTransport).setUseReadOnlyOutputBuffer(false); + } catch (NoSuchMethodError nsme) { + // using a version at runtime where the optimisation isn't available, ignore + LOG.trace("Proton output buffer optimisation unavailable"); + } + if (getMaxFrameSize() > 0) { protonTransport.setMaxFrameSize(getMaxFrameSize()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
