Github user michaelandrepearce commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/2427#discussion_r234527890 --- Diff: artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java --- @@ -52,6 +52,62 @@ * consumers */ public class CoreMessage extends RefCountMessage implements ICoreMessage { + private static final class CoreTypedProperties extends TypedProperties { + + // We use properties to establish routing context on clustering. + // However if the client resends the message after receiving, it needs to be removed + private static final Predicate<SimpleString> INTERNAL_PROPERTY_NAMES_CLEANUP_FILTER = + name -> (name.startsWith(Message.HDR_ROUTE_TO_IDS) && !name.equals(Message.HDR_ROUTE_TO_IDS)) || + (name.startsWith(Message.HDR_ROUTE_TO_ACK_IDS) && !name.equals(Message.HDR_ROUTE_TO_ACK_IDS)); + private static final SimpleString AMQ_PROPNAME = new SimpleString("_AMQ_"); + private boolean internalProperties; + + CoreTypedProperties() { + super(); + internalProperties = false; + } + + private CoreTypedProperties(TypedProperties other) { + super(other); + if (other instanceof CoreTypedProperties) { + internalProperties = ((CoreTypedProperties) other).internalProperties; + } else { + internalProperties = other.containsProperty(name -> name.startsWith(AMQ_PROPNAME)); + } + } + + @Override + protected synchronized void doPutValue(SimpleString key, TypedProperties.PropertyValue value) { + if (!internalProperties && key.startsWith(AMQ_PROPNAME)) { + internalProperties = true; + } + super.doPutValue(key, value); + } + + public synchronized boolean cleanupInternalProperties() { + if (!internalProperties) { + return false; + } + return removeProperty(INTERNAL_PROPERTY_NAMES_CLEANUP_FILTER); + } + + public static boolean cleanupInternalProperties(TypedProperties typedProperties) { + if (typedProperties == null) { + return false; + } + if (typedProperties instanceof CoreTypedProperties) { + return ((CoreTypedProperties) typedProperties).cleanupInternalProperties(); + } + return typedProperties.removeProperty(INTERNAL_PROPERTY_NAMES_CLEANUP_FILTER); + } + + public static CoreTypedProperties copyOf(TypedProperties typedProperties) { + synchronized (typedProperties) { --- End diff -- +1 agreed this would need to be resolved as currently thats why the flag exist to avoid the iterating over the properties.
---