You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/04/21 18:17:44 UTC
[1/3] activemq-artemis git commit: Removing Marshalled property from
Openwire
Repository: activemq-artemis
Updated Branches:
refs/heads/master 1f586eaec -> 8fc618d30
Removing Marshalled property from Openwire
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/31055b6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/31055b6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/31055b6f
Branch: refs/heads/master
Commit: 31055b6f0af76e64bdfe4d13d264bff10c3ec6f5
Parents: 1f586ea
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Apr 20 22:32:24 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Apr 20 23:00:57 2016 -0400
----------------------------------------------------------------------
.../openwire/OpenWireMessageConverter.java | 24 --------------------
1 file changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/31055b6f/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
index cfe5b47..121560f 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
@@ -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) {
[2/3] activemq-artemis git commit: Created queue should be durable on
openwire
Posted by cl...@apache.org.
Created queue should be durable on openwire
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/172de47c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/172de47c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/172de47c
Branch: refs/heads/master
Commit: 172de47ce08bc27e977566f71960aba73f4a2f87
Parents: 31055b6
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Apr 21 10:44:50 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Apr 21 10:44:50 2016 -0400
----------------------------------------------------------------------
.../artemis/core/protocol/openwire/OpenWireConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/172de47c/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index a9cbf0c..b1f892a 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -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);
}
}
[3/3] activemq-artemis git commit: This closes #478
Posted by cl...@apache.org.
This closes #478
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8fc618d3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8fc618d3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8fc618d3
Branch: refs/heads/master
Commit: 8fc618d30e815da13f92c3f2b4a3e0813a35372c
Parents: 1f586ea 172de47
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Apr 21 12:13:42 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Apr 21 12:13:42 2016 -0400
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 2 +-
.../openwire/OpenWireMessageConverter.java | 24 --------------------
2 files changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------