From 4a3fa320e75870cef83f46ab125eda0dfc0cc69f Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon (cshannon)" Date: Fri, 15 Apr 2016 13:05:06 +0000 Subject: [PATCH] Revert "https://issues.apache.org/jira/browse/AMQ-6218" This reverts commit 93bc7030e263d6ed5bab7b778b15d50d46fe2c66. --- .../org/apache/activemq/command/ActiveMQTextMessage.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java index 4618341ee3..97fc9e4aa1 100755 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java @@ -55,12 +55,6 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage } private void copy(ActiveMQTextMessage copy) { - //AMQ-6218 - Save text before calling super.copy() to prevent a race condition when - //concurrent store and dispatch is enabled in KahaDB - //The issue is sometimes beforeMarshall() gets called in between the time content and - //text are copied to the new object leading to both fields being null when text should - //not be null - String text = this.text; super.copy(copy); copy.text = text; } @@ -85,11 +79,9 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage @Override public String getText() throws JMSException { ByteSequence content = getContent(); - String text = this.text; if (text == null && content != null) { text = decodeContent(content); - this.text = text; setContent(null); setCompressed(false); }