[1/2] activemq-artemis git commit: ARTEMIS-1169 - Implement Interceptors for the AMQP protocol

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] activemq-artemis git commit: ARTEMIS-1169 - Implement Interceptors for the AMQP protocol

nigrofranz
Repository: activemq-artemis
Updated Branches:
  refs/heads/master db8c567ba -> 72ab99fc6


ARTEMIS-1169 - Implement Interceptors for the AMQP protocol

Add Outgoing call

https://issues.apache.org/jira/browse/ARTEMIS-1169


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/22f4736c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/22f4736c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/22f4736c

Branch: refs/heads/master
Commit: 22f4736c8884c4e42be76cc85ab0f076a4f7d990
Parents: db8c567
Author: Andy Taylor <[hidden email]>
Authored: Thu May 18 08:40:35 2017 +0100
Committer: Andy Taylor <[hidden email]>
Committed: Thu May 18 08:40:43 2017 +0100

----------------------------------------------------------------------
 .../activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java | 1 +
 .../tests/integration/amqp/AmqpSendReceiveInterceptorTest.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/22f4736c/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 6ba0ab5..4b26d79 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -567,6 +567,7 @@ public class AMQPSessionCallback implements SessionCallback {
       ProtonServerSenderContext plugSender = (ProtonServerSenderContext) consumer.getProtocolContext();
 
       try {
+         invokeOutgoing((AMQPMessage) message, (ActiveMQProtonRemotingConnection) transportConnection.getProtocolConnection());
          return plugSender.deliverMessage(ref, deliveryCount);
       } catch (Exception e) {
          connection.lock();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/22f4736c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveInterceptorTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveInterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveInterceptorTest.java
index 54ff451..beb6a88 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveInterceptorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveInterceptorTest.java
@@ -70,7 +70,7 @@ public class AmqpSendReceiveInterceptorTest extends AmqpClientTestSupport {
       receiver.flow(2);
       AmqpMessage amqpMessage = receiver.receive(5, TimeUnit.SECONDS);
       assertNotNull(amqpMessage);
-      assertEquals(latch.getCount(), 0);
+      assertEquals(latch2.getCount(), 0);
       receiver.close();
       connection.close();
    }

Reply | Threaded
Open this post in threaded view
|

[2/2] activemq-artemis git commit: This closes #1279 ARTEMIS-1169 - Implement Interceptors for the AMQP protocol

nigrofranz
This closes #1279 ARTEMIS-1169 - Implement Interceptors for the AMQP protocol


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/72ab99fc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/72ab99fc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/72ab99fc

Branch: refs/heads/master
Commit: 72ab99fc62a32fd303274912fa1a487741ec998a
Parents: db8c567 22f4736
Author: Francesco Nigro <[hidden email]>
Authored: Thu May 18 10:43:37 2017 +0200
Committer: Francesco Nigro <[hidden email]>
Committed: Thu May 18 10:43:37 2017 +0200

----------------------------------------------------------------------
 .../activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java | 1 +
 .../tests/integration/amqp/AmqpSendReceiveInterceptorTest.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------