activemq-artemis git commit: ARTEMIS-1633 - Include populated RoutingContext in beforeMessageRoute call

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

activemq-artemis git commit: ARTEMIS-1633 - Include populated RoutingContext in beforeMessageRoute call

cshannon
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 4883b0360 -> 33b265ca6


ARTEMIS-1633 - Include populated RoutingContext in beforeMessageRoute
call

There was a small bug in the previous commit, the beforeMessageRoute
callback was being executed too early so the RoutingCountext wasn't
being filled in


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

Branch: refs/heads/master
Commit: 33b265ca6bf5b84553500dddcf096b13683bb8c8
Parents: 4883b03
Author: Christopher L. Shannon (cshannon) <[hidden email]>
Authored: Thu Feb 8 07:07:33 2018 -0500
Committer: Christopher L. Shannon (cshannon) <[hidden email]>
Committed: Thu Feb 8 07:08:50 2018 -0500

----------------------------------------------------------------------
 .../artemis/core/postoffice/impl/PostOfficeImpl.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/33b265ca/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index 9de5dcc..12c722a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -809,10 +809,6 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
 
       message.cleanupInternalProperties();
 
-      if (server.hasBrokerPlugins()) {
-         server.callBrokerPlugins(plugin -> plugin.beforeMessageRoute(message, context, direct, rejectDuplicates));
-      }
-
       Bindings bindings = addressManager.getBindingsForRoutingAddress(context.getAddress(message));
 
       // TODO auto-create queues here?
@@ -836,6 +832,10 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
          }
       }
 
+      if (server.hasBrokerPlugins()) {
+         server.callBrokerPlugins(plugin -> plugin.beforeMessageRoute(message, context, direct, rejectDuplicates));
+      }
+
       if (logger.isTraceEnabled()) {
          logger.trace("Message after routed=" + message);
       }