You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/10/29 19:16:48 UTC
git commit: https://issues.apache.org/jira/browse/AMQ-5402
Repository: activemq
Updated Branches:
refs/heads/trunk dffccb1c7 -> 0b148ade3
https://issues.apache.org/jira/browse/AMQ-5402
Revert the changes here as the mapping is moving in a different
direction.
4881a848dc9c8170ab82267a6bdedd4d3adcc372
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0b148ade
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0b148ade
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0b148ade
Branch: refs/heads/trunk
Commit: 0b148ade32e58b83ed6ec9a1d04ff606b717d158
Parents: dffccb1
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Oct 29 14:16:34 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 29 14:16:34 2014 -0400
----------------------------------------------------------------------
.../transport/amqp/AmqpProtocolConverter.java | 18 ------------------
.../activemq/transport/amqp/AmqpWireFormat.java | 9 ---------
2 files changed, 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/0b148ade/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
----------------------------------------------------------------------
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 7b3b825..3518dbc 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<Symbol, Object> 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;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/0b148ade/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpWireFormat.java
----------------------------------------------------------------------
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 b58273d..f6c2880 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;
- }
}