From 0b148ade32e58b83ed6ec9a1d04ff606b717d158 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Wed, 29 Oct 2014 14:16:34 -0400 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-5402 Revert the changes here as the mapping is moving in a different direction. 4881a848dc9c8170ab82267a6bdedd4d3adcc372 --- .../transport/amqp/AmqpProtocolConverter.java | 18 ------------------ .../transport/amqp/AmqpWireFormat.java | 9 --------- 2 files changed, 27 deletions(-) diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java index 7b3b825f60..3518dbc98d 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java @@ -134,7 +134,6 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { protected Transport protonTransport = Proton.transport(); protected Connection protonConnection = Proton.connection(); protected Collector eventCollector = new CollectorImpl(); - protected boolean useByteDestinationTypeAnnotation; public AmqpProtocolConverter(AmqpTransport transport, BrokerService brokerService) { this.amqpTransport = transport; @@ -146,8 +145,6 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { this.protonTransport.setMaxFrameSize(maxFrameSize); } - useByteDestinationTypeAnnotation = transport.getWireFormat().isUseByteDestinationTypeAnnotation(); - this.protonTransport.bind(this.protonConnection); // NOTE: QPid JMS client has a bug where the channel max is stored as a @@ -488,17 +485,6 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { connectionInfo.setClientId(clientId); } - Map props = protonConnection.getRemoteProperties(); - if (props != null) { - if (props.containsKey(JMS_MAPPING_VERSION)) { - useByteDestinationTypeAnnotation = true; - } - } - - if (useByteDestinationTypeAnnotation) { - outboundTransformer.setUseByteDestinationTypeAnnotations(true); - } - connectionInfo.setTransportContext(amqpTransport.getPeerCertificates()); sendToActiveMQ(connectionInfo, new ResponseHandler() { @@ -572,10 +558,6 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { LOG.warn("Unknown transformer type {} using native one instead", transformer); inboundTransformer = new AMQPNativeInboundTransformer(ActiveMQJMSVendor.INSTANCE); } - - if (useByteDestinationTypeAnnotation) { - inboundTransformer.setUseByteDestinationTypeAnnotations(true); - } } return inboundTransformer; } diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java index b58273d751..f6c2880bf8 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java @@ -41,7 +41,6 @@ public class AmqpWireFormat implements WireFormat { private long maxFrameSize = DEFAULT_MAX_FRAME_SIZE; private int maxAmqpFrameSize = NO_AMQP_MAX_FRAME_SIZE; private String anonymousNodeName = "$relay"; - private boolean useByteDestinationTypeAnnotation = false; @Override public ByteSequence marshal(Object command) throws IOException { @@ -136,12 +135,4 @@ public class AmqpWireFormat implements WireFormat { public void setAnonymousNodeName(String anonymousNodeName) { this.anonymousNodeName = anonymousNodeName; } - - public boolean isUseByteDestinationTypeAnnotation() { - return useByteDestinationTypeAnnotation; - } - - public void setUseByteDestinationTypeAnnotation(boolean useByteDestinationTypeAnnotation) { - this.useByteDestinationTypeAnnotation = useByteDestinationTypeAnnotation; - } }