You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/03/10 15:16:51 UTC
[activemq] branch activemq-5.15.x updated: Revert "AMQ-7291 - allow
setting properties after clearProperties for BytesMessage, closes #420"
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new 6e75460 Revert "AMQ-7291 - allow setting properties after clearProperties for BytesMessage, closes #420"
6e75460 is described below
commit 6e75460aab63b222984f73d01145b7c229034824
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Mar 10 16:16:42 2020 +0100
Revert "AMQ-7291 - allow setting properties after clearProperties for BytesMessage, closes #420"
This reverts commit b999e2b7787f8b9bd556456b1e6ebf4cbfc0881e.
---
.../activemq/command/ActiveMQBytesMessage.java | 6 ++++++
.../activemq/command/ActiveMQBytesMessageTest.java | 24 ----------------------
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
index 199fd9e..71a39f8 100644
--- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
@@ -913,6 +913,12 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
}
@Override
+ public void setObjectProperty(String name, Object value) throws JMSException {
+ initializeWriting();
+ super.setObjectProperty(name, value);
+ }
+
+ @Override
public String toString() {
return super.toString() + " ActiveMQBytesMessage{ " + "bytesOut = " + bytesOut + ", dataOut = " + dataOut + ", dataIn = " + dataIn + " }";
}
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java
index 6b01d05..0219815 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java
@@ -269,30 +269,6 @@ public class ActiveMQBytesMessageTest extends TestCase {
}
}
- public void testClearProperties() throws Exception {
- ActiveMQBytesMessage bytesMessage = new ActiveMQBytesMessage();
- bytesMessage.setIntProperty("one", 1);
- // simulate send
- bytesMessage.onSend();
-
- assertEquals(1, bytesMessage.getIntProperty("one"));
- assertTrue(bytesMessage.isReadOnlyProperties());
-
- try {
- bytesMessage.setIntProperty("two", 2);
- fail("should have thrown b/c readonly");
- } catch (MessageNotWriteableException expected) {
- }
-
- // allow writing new properties
- bytesMessage.clearProperties();
- assertFalse(bytesMessage.propertyExists("one"));
- assertFalse(bytesMessage.isReadOnlyProperties());
-
- bytesMessage.setIntProperty("two", 2);
- assertEquals(2, bytesMessage.getIntProperty("two"));
- }
-
public void testReset() throws JMSException {
ActiveMQBytesMessage message = new ActiveMQBytesMessage();
try {