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

This closes #2252

This commit is contained in:
Justin Bertram 2018-08-17 10:02:08 -05:00
parent 0dff36e00b 3952bcdbe8
commit 29f9483960
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
View File

@ -144,28 +144,36 @@ public class ActiveMQSession implements QueueSession, TopicSession {
public BytesMessage createBytesMessage() throws JMSException {
checkClosed();
return new ActiveMQBytesMessage(session);
ActiveMQBytesMessage message = new ActiveMQBytesMessage(session);
message.setEnable1xPrefixes(enable1xPrefixes);
return message;
}
@Override
public MapMessage createMapMessage() throws JMSException {
checkClosed();
return new ActiveMQMapMessage(session);
ActiveMQMapMessage message = new ActiveMQMapMessage(session);
message.setEnable1xPrefixes(enable1xPrefixes);
return message;
}
@Override
public Message createMessage() throws JMSException {
checkClosed();
return new ActiveMQMessage(session);
ActiveMQMessage message = new ActiveMQMessage(session);
message.setEnable1xPrefixes(enable1xPrefixes);
return message;
}
@Override
public ObjectMessage createObjectMessage() throws JMSException {
checkClosed();
return new ActiveMQObjectMessage(session, options);
ActiveMQObjectMessage message = new ActiveMQObjectMessage(session, options);
message.setEnable1xPrefixes(enable1xPrefixes);
return message;
}
@Override
@ -173,8 +181,8 @@ public class ActiveMQSession implements QueueSession, TopicSession {
checkClosed();
ActiveMQObjectMessage msg = new ActiveMQObjectMessage(session, options);
msg.setObject(object);
msg.setEnable1xPrefixes(enable1xPrefixes);
return msg;
}
@ -183,7 +191,9 @@ public class ActiveMQSession implements QueueSession, TopicSession {
public StreamMessage createStreamMessage() throws JMSException {
checkClosed();
return new ActiveMQStreamMessage(session);
ActiveMQStreamMessage message = new ActiveMQStreamMessage(session);
message.setEnable1xPrefixes(enable1xPrefixes);
return message;
}
@Override
@ -191,8 +201,8 @@ public class ActiveMQSession implements QueueSession, TopicSession {
checkClosed();
ActiveMQTextMessage msg = new ActiveMQTextMessage(session);
msg.setText(null);
msg.setEnable1xPrefixes(enable1xPrefixes);
return msg;
}
@ -202,8 +212,8 @@ public class ActiveMQSession implements QueueSession, TopicSession {
checkClosed();
ActiveMQTextMessage msg = new ActiveMQTextMessage(session);
msg.setText(text);
msg.setEnable1xPrefixes(enable1xPrefixes);
return msg;
}

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java
View File

@ -282,6 +282,8 @@ public class ActiveMQMessageHandler implements MessageHandler, FailoverEventList
}
ActiveMQMessage msg = ActiveMQMessage.createMessage(message, session, options);
msg.setEnable1xPrefixes(activation.getConnectionFactory().isEnable1xPrefixes());
boolean beforeDelivery = false;
try {