You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/03/02 13:57:25 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1504 Update Qpid JMS to
0.30.0 and proton-j to 0.26.0
Repository: activemq-artemis
Updated Branches:
refs/heads/master 005e9d67d -> 85f249c77
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
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/79674ca5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/79674ca5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/79674ca5
Branch: refs/heads/master
Commit: 79674ca5dbf959c2064a18a459faebf4fddbbb4a
Parents: 005e9d6
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Mar 1 19:12:36 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Mar 2 08:57:20 2018 -0500
----------------------------------------------------------------------
.../protocol/amqp/proton/handler/ProtonHandler.java | 12 +++++++++++-
pom.xml | 4 ++--
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79674ca5/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
index 666e147..58b4988 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.artemis.protocol.amqp.proton.handler;
-import javax.security.auth.Subject;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -26,6 +25,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
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.sasl.ClientSASL;
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.Sasl;
import org.apache.qpid.proton.engine.Transport;
+import org.apache.qpid.proton.engine.impl.TransportInternal;
import org.jboss.logging.Logger;
import io.netty.buffer.ByteBuf;
@@ -93,6 +95,14 @@ public class ProtonHandler extends ProtonInitializable {
});
this.creationTime = System.currentTimeMillis();
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);
connection.collect(collector);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79674ca5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c34fcc4..12b1319 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,10 +92,10 @@
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>2.8.47</mockito.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>
<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>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version>
[2/2] activemq-artemis git commit: This closes #1916
Posted by cl...@apache.org.
This closes #1916
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/85f249c7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/85f249c7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/85f249c7
Branch: refs/heads/master
Commit: 85f249c77160535f0d1ef17484223238319176b5
Parents: 005e9d6 79674ca
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Mar 2 08:57:21 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Mar 2 08:57:21 2018 -0500
----------------------------------------------------------------------
.../protocol/amqp/proton/handler/ProtonHandler.java | 12 +++++++++++-
pom.xml | 4 ++--
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------