[
https://issues.apache.org/jira/browse/ARTEMIS-1498?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16350980#comment-16350980
]
ASF GitHub Bot commented on ARTEMIS-1498:
-----------------------------------------
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1793#discussion_r165768988
--- Diff:
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessage.java
---
@@ -0,0 +1,1152 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.core.protocol.openwire;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.LinkedList;
+import java.util.Set;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import
org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException;
+import org.apache.activemq.artemis.api.core.ICoreMessage;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.RefCountMessage;
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper;
+import
org.apache.activemq.artemis.core.buffers.impl.ResetLimitWrappedActiveMQBuffer;
+import org.apache.activemq.artemis.core.message.LargeBodyEncoder;
+import
org.apache.activemq.artemis.core.message.impl.CoreMessageObjectPools;
+import org.apache.activemq.artemis.core.persistence.Persister;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.reader.MessageUtil;
+import org.apache.activemq.artemis.utils.DataConstants;
+import org.apache.activemq.artemis.utils.UUID;
+import org.apache.activemq.artemis.utils.collections.TypedProperties;
+import org.jboss.logging.Logger;
+
+/** Note: you shouldn't change properties using multi-threads. Change your
properties before you can send it to multiple
+ * consumers */
+public class OpenWireMessage extends RefCountMessage {
+ public static final int BUFFER_HEADER_SPACE =
PacketImpl.PACKET_HEADERS_SIZE;
+
+ private volatile int memoryEstimate = -1;
+ private static final Logger logger =
Logger.getLogger(OpenWireMessage.class);
+
+ // There's an integer with the number of bytes for the body
+ public static final int BODY_OFFSET = DataConstants.SIZE_INT;
+
+ /** That is the encode for the whole message, including properties..
+ it does not include the buffer for the Packet send and receive
header on core protocol */
+ protected ByteBuf buffer;
+
+ private volatile boolean validBuffer = false;
--- End diff --
Lets merge it, and then sort it later IMO. Im keen to get this big PR in,
as long as functional and no-regressions im happy personally.
> [interop] Openwire internal headers should not be part of message properties
> ----------------------------------------------------------------------------
>
> Key: ARTEMIS-1498
> URL: https://issues.apache.org/jira/browse/ARTEMIS-1498
> Project: ActiveMQ Artemis
> Issue Type: Bug
> Components: OpenWire
> Environment: interoperability between Openwire -> AMQP/Core
> Reporter: Michal Toth
> Priority: Minor
>
> Sending an empty message from Openwire JMS client to AMQP or Core receiver
> client shows extra "internal" headers (__HDR_*) in message properties.
> They should not be there, as these are internal for broker in my opinion.
> Openwire sender
> {noformat}
> $ java -jar /var/dtests/node_data/clients/aoc7.jar sender --timeout 5
> --log-msgs interop --broker tcp://localhost:61616 --address queue_name_\$
> --count 1 --conn-username admin --conn-password admin
> {'durable': True, 'priority': 4, 'ttl': 0, 'first-acquirer': False,
> 'delivery-count': 0, 'id':
> 'dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1:1:1:1',
> 'user-id':None, 'address': 'queue_name_$', 'subject': None, 'reply-to': None,
> 'correlation-id': None, 'content-type': None, 'content-encoding': None,
> 'absolute-expiry-time': 0, 'creation-time': 1509702974798, 'group-id': None,
> 'group-sequence': 0, 'reply-to-group-id': None, 'properties': {}, 'content':
> None, 'type': None}
> {noformat}
> AMQP/Core receiver
> {noformat}
> $ java -jar /var/dtests/node_data/clients/aac1.jar receiver --timeout 5
> --log-msgs interop --broker localhost:5672 --address queue_name_\$ --count 1
> --conn-username admin --conn-password admin
> Unsupported object type org.apache.qpid.proton.amqp.Binary
> \x00\x00\x00Jn\x02\xae\x02{\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01\x00\x01
> Unsupported object type org.apache.qpid.proton.amqp.Binary
> \x00\x00\x00F{\x01+\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01
> {'durable': True, 'priority': 4, 'ttl': 0, 'first-acquirer': False,
> 'delivery-count': 0, 'id': None, 'user-id': None, 'address': 'queue_name_$',
> 'subject': None, 'reply-to': None, 'correlation-id': None, 'content-type':
> None, 'content-encoding': None, 'absolute-expiry-time': 0, 'creation-time':
> 1509702974798, 'group-id': None, 'group-sequence': 0, 'reply-to-group-id':
> None, 'properties': {'__HDR_COMMAND_ID': 5, 'JMSXDeliveryCount': 1,
> '__HDR_ARRIVAL': 0, '__HDR_MESSAGE_ID':
> \x00\x00\x00Jn\x02\xae\x02{\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01\x00\x01,
> '__HDR_GROUP_SEQUENCE': 0, '__HDR_PRODUCER_ID':
> \x00\x00\x00F{\x01+\x00=ID:dhcp-145-96.lab.eng.brq.redhat.com-33646-1509702974536-1:1\x00\x01\x00\x01,
> '__HDR_DROPPABLE': False, '__HDR_BROKER_IN_TIME': 1509702974800}, 'content':
> None}
> {noformat}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
