activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/3] activemq-artemis git commit: ARTEMIS-1633 proper initialize route result
Date Thu, 25 Jan 2018 18:34:44 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master a82ffbcb7 -> c671fa078


ARTEMIS-1633 proper initialize route result


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

Branch: refs/heads/master
Commit: 24b1f2efbcd60e985d652e7ae970cecb1378a8d0
Parents: 37cc1e3
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Thu Jan 25 12:10:58 2018 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Jan 25 12:11:11 2018 -0500

----------------------------------------------------------------------
 .../activemq/artemis/core/postoffice/impl/PostOfficeImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24b1f2ef/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 456f200..bc14f79 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
@@ -752,7 +752,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener,
Binding
                               boolean rejectDuplicates,
                               final Binding bindingMove) throws Exception {
 
-      RoutingStatus result = RoutingStatus.OK;
+      RoutingStatus result;
       // Sanity check
       if (message.getRefCount() > 0) {
          throw new IllegalStateException("Message cannot be routed more than once");
@@ -842,6 +842,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener,
Binding
             }
          }
       } else {
+         result = RoutingStatus.OK;
          try {
             processRoute(message, context, direct);
          } catch (ActiveMQAddressFullException e) {
@@ -858,8 +859,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener,
Binding
          context.getTransaction().commit();
       }
 
-      final RoutingStatus finalResult = result;
-      server.callBrokerPlugins(server.hasBrokerPlugins() ? plugin -> plugin.afterMessageRoute(message,
context, direct, rejectDuplicates, finalResult) : null);
+      server.callBrokerPlugins(server.hasBrokerPlugins() ? plugin -> plugin.afterMessageRoute(message,
context, direct, rejectDuplicates, result) : null);
 
       return result;
    }


Mime
View raw message