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 #478

This commit is contained in:
Clebert Suconic 2016-04-21 12:13:42 -04:00
parent 1f586eaecb 172de47ce0
commit 8fc618d30e
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
View File

@ -692,7 +692,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
CheckType checkType = dest.isTemporary() ? CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
server.getSecurityStore().check(qName, checkType, this);
server.checkQueueCreationLimit(getUsername());
server.createQueue(qName, qName, null, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), false, false);
server.createQueue(qName, qName, null, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), true, false);
}
}

24
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
View File

@ -90,8 +90,6 @@ public class OpenWireMessageConverter implements MessageConverter {
private static final String AMQ_MSG_MARSHALL_PROP = AMQ_PREFIX + "MARSHALL_PROP";
private static final String AMQ_MSG_REPLY_TO = AMQ_PREFIX + "REPLY_TO";
private static final String AMQ_MSG_CONSUMER_ID = AMQ_PREFIX + "CONSUMER_ID";
private static final String AMQ_MSG_TX_ID = AMQ_PREFIX + "TX_ID";
private static final String AMQ_MSG_USER_ID = AMQ_PREFIX + "USER_ID";
private static final String AMQ_MSG_DROPPABLE = AMQ_PREFIX + "DROPPABLE";
@ -382,17 +380,6 @@ public class OpenWireMessageConverter implements MessageConverter {
ConsumerId consumerId = messageSend.getTargetConsumerId();
if (consumerId != null) {
ByteSequence consumerIdBytes = marshaller.marshal(consumerId);
consumerIdBytes.compact();
coreMessage.putBytesProperty(AMQ_MSG_CONSUMER_ID, consumerIdBytes.data);
}
TransactionId txId = messageSend.getTransactionId();
if (txId != null) {
ByteSequence txIdBytes = marshaller.marshal(txId);
txIdBytes.compact();
coreMessage.putBytesProperty(AMQ_MSG_TX_ID, txIdBytes.data);
}
String userId = messageSend.getUserID();
if (userId != null) {
@ -769,17 +756,6 @@ public class OpenWireMessageConverter implements MessageConverter {
amqMsg.setReplyTo(replyTo);
}
byte[] consumerIdBytes = (byte[]) coreMessage.getObjectProperty(AMQ_MSG_CONSUMER_ID);
if (consumerIdBytes != null) {
ConsumerId consumerId = (ConsumerId) marshaller.unmarshal(new ByteSequence(consumerIdBytes));
amqMsg.setTargetConsumerId(consumerId);
}
byte[] txIdBytes = (byte[]) coreMessage.getObjectProperty(AMQ_MSG_TX_ID);
if (txIdBytes != null) {
TransactionId txId = (TransactionId) marshaller.unmarshal(new ByteSequence(txIdBytes));
amqMsg.setTransactionId(txId);
}
String userId = (String) coreMessage.getObjectProperty(AMQ_MSG_USER_ID);
if (userId != null) {