Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for: https://issues.apache.org/jira/browse/AMQ-4893

This commit is contained in:
Timothy Bish 2013-11-25 14:48:38 -05:00
parent b0e91d47f5
commit a6e306437e
3 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
View File

@ -38,6 +38,7 @@ import org.apache.activemq.state.CommandVisitor;
import org.apache.activemq.util.Callback;
import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.TypeConversionSupport;
import org.fusesource.hawtbuf.UTF8Buffer;
/**
*
@ -484,6 +485,10 @@ public class ActiveMQMessage extends Message implements org.apache.activemq.Mess
throw new IllegalArgumentException("Property name cannot be empty or null");
}
if (value instanceof UTF8Buffer) {
value = value.toString();
}
checkValidObject(value);
value = convertScheduled(name, value);
PropertySetter setter = JMS_PROPERTY_SETERS.get(name);

3
activemq-unit-tests/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/createData
/derbydb_15
/testJdbcConfig

69
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4893Test.java Normal file
View File

@ -0,0 +1,69 @@
package org.apache.activemq.bugs;
import java.io.IOException;
import java.util.Map;
import javax.jms.JMSException;
import org.apache.activemq.command.ActiveMQObjectMessage;
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.util.ByteSequence;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AMQ4893Test {
private static final transient Logger LOG = LoggerFactory.getLogger(AMQ4893Test.class);
@Test
public void testPropertiesInt() throws Exception {
ActiveMQObjectMessage message = new ActiveMQObjectMessage();
message.setIntProperty("TestProp", 333);
fakeUnmarshal(message);
roundTripProperties(message);
}
@Test
public void testPropertiesString() throws Exception {
ActiveMQObjectMessage message = new ActiveMQObjectMessage();
message.setStringProperty("TestProp", "Value");
fakeUnmarshal(message);
roundTripProperties(message);
}
@Test
public void testPropertiesObject() throws Exception {
ActiveMQObjectMessage message = new ActiveMQObjectMessage();
message.setObjectProperty("TestProp", "Value");
fakeUnmarshal(message);
roundTripProperties(message);
}
@Test
public void testPropertiesObjectNoMarshalling() throws Exception {
ActiveMQObjectMessage message = new ActiveMQObjectMessage();
message.setObjectProperty("TestProp", "Value");
roundTripProperties(message);
}
private void roundTripProperties(ActiveMQObjectMessage message) throws IOException, JMSException {
ActiveMQObjectMessage copy = new ActiveMQObjectMessage();
for (Map.Entry<String, Object> prop : message.getProperties().entrySet()) {
LOG.debug("{} -> {}", prop.getKey(), prop.getValue().getClass());
copy.setObjectProperty(prop.getKey(), prop.getValue());
}
}
private void fakeUnmarshal(ActiveMQObjectMessage message) throws IOException {
// we need to force the unmarshalled property field to be set so it
// gives us a hawtbuffer for the string
OpenWireFormat format = new OpenWireFormat();
message.beforeMarshall(format);
message.afterMarshall(format);
ByteSequence seq = message.getMarshalledProperties();
message.clearProperties();
message.setMarshalledProperties(seq);
}
}