Github user clebertsuconic commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/1787#discussion_r162353710 --- Diff: artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java --- @@ -736,11 +736,11 @@ public RoutingStatus route(final Message message, throw new IllegalStateException("Message cannot be routed more than once"); } - setPagingStore(message); + setPagingStore(context.getAddress(message), message); AtomicBoolean startedTX = new AtomicBoolean(false); - final SimpleString address = message.getAddressSimpleString(); + final SimpleString address = context.getAddress(message); --- End diff -- I'm just going for the simple refactoring here.. every call to message.getAddressSimplString() to be calling context.getAddress()
---