From commits-return-52471-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Thu Aug 2 00:34:51 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8268A180634 for ; Thu, 2 Aug 2018 00:34:50 +0200 (CEST) Received: (qmail 96671 invoked by uid 500); 1 Aug 2018 22:34:49 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 96658 invoked by uid 99); 1 Aug 2018 22:34:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2018 22:34:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 906F7DFB34; Wed, 1 Aug 2018 22:34:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Message-Id: <0ee8bf0c2629466b984eb9cc01a1f922@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: AMQ-7001 Remove now unnecessary check for UTF8Buffer type Date: Wed, 1 Aug 2018 22:34:49 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/activemq-5.15.x ad0ae74f3 -> 77e584f05 AMQ-7001 Remove now unnecessary check for UTF8Buffer type Remove the now unneeded checks for UTF8Buffer on the outbound converter as the Codec now can encode those to the correct string AMQP types without need for any help. (cherry picked from commit ba7934e91adf1c068db7107a6353b867e276affb) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/77e584f0 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/77e584f0 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/77e584f0 Branch: refs/heads/activemq-5.15.x Commit: 77e584f05700dd6b2f7cf1eb3f63423b6eaa6393 Parents: ad0ae74 Author: Timothy Bish Authored: Wed Aug 1 18:34:09 2018 -0400 Committer: Timothy Bish Committed: Wed Aug 1 18:34:40 2018 -0400 ---------------------------------------------------------------------- .../transport/amqp/message/JMSMappingOutboundTransformer.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/77e584f0/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java index f3db5e4..346a54c 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java @@ -88,7 +88,6 @@ import org.apache.qpid.proton.amqp.messaging.Section; import org.apache.qpid.proton.codec.AMQPDefinedTypes; import org.apache.qpid.proton.codec.DecoderImpl; import org.apache.qpid.proton.codec.EncoderImpl; -import org.fusesource.hawtbuf.UTF8Buffer; public class JMSMappingOutboundTransformer implements OutboundTransformer { @@ -256,9 +255,6 @@ public class JMSMappingOutboundTransformer implements OutboundTransformer { for (Map.Entry entry : entries.entrySet()) { String key = entry.getKey(); Object value = entry.getValue(); - if (value instanceof UTF8Buffer) { - value = value.toString(); - } if (key.startsWith(JMS_AMQP_PREFIX)) { if (key.startsWith(NATIVE, JMS_AMQP_PREFIX_LENGTH)) {