Repository: activemq-artemis Updated Branches: refs/heads/master a7a556f95 -> 41737c8f3
Revert "NO-JIRA Remove Property shouldn't invalidate buffer if not found" This reverts commit cf71b7292a06438c341fc3677243772e02b79812. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/41737c8f Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/41737c8f Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/41737c8f Branch: refs/heads/master Commit: 41737c8f3cf1501d563556e000aaca07a0417d30 Parents: a7a556f Author: Clebert Suconic <[email protected]> Authored: Fri Feb 17 11:52:07 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Fri Feb 17 11:52:07 2017 -0500 ---------------------------------------------------------------------- .../activemq/artemis/core/message/impl/MessageImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/41737c8f/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java index 5d99da6..f93086c 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java @@ -859,13 +859,9 @@ public abstract class MessageImpl implements MessageInternal { @Override public Object removeProperty(final SimpleString key) { - Object oldValue = properties.removeProperty(key); - - if (oldValue != null) { - bufferValid = false; - } + bufferValid = false; - return oldValue; + return properties.removeProperty(key); } @Override
