Repository: activemq-artemis Updated Branches: refs/heads/1.x f492bd978 -> 779a19d12
Revert "NO-JIRA Remove Property shouldn't invalidate buffer if not found" This reverts commit f492bd978648edecfbc0cdd378f856e295cf2bde. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/779a19d1 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/779a19d1 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/779a19d1 Branch: refs/heads/1.x Commit: 779a19d1219bf7ce0e210996169c40bd61dac338 Parents: f492bd9 Author: Clebert Suconic <[email protected]> Authored: Fri Feb 17 12:21:24 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Fri Feb 17 12:21:24 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/779a19d1/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 92dc2c9..69e6e65 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
