Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add properties to the connection that indicate what the proper 

destination prefix value should be for Topic or Queue destination types.
This commit is contained in:
Timothy Bish 2014-12-19 12:26:49 -05:00
parent 9927824c27
commit a090472942
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
View File

@ -121,6 +121,8 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
private static final byte[] EMPTY_BYTE_ARRAY = new byte[] {}; private static final byte[] EMPTY_BYTE_ARRAY = new byte[] {};
private static final int CHANNEL_MAX = 32767; private static final int CHANNEL_MAX = 32767;
private static final Symbol ANONYMOUS_RELAY = Symbol.valueOf("ANONYMOUS-RELAY"); private static final Symbol ANONYMOUS_RELAY = Symbol.valueOf("ANONYMOUS-RELAY");
private static final Symbol QUEUE_PREFIX = Symbol.valueOf("queue-prefix");
private static final Symbol TOPIC_PREFIX = Symbol.valueOf("topic-prefix");
private static final Symbol COPY = Symbol.getSymbol("copy"); private static final Symbol COPY = Symbol.getSymbol("copy");
private static final Symbol JMS_SELECTOR = Symbol.valueOf("jms-selector"); private static final Symbol JMS_SELECTOR = Symbol.valueOf("jms-selector");
private static final Symbol NO_LOCAL = Symbol.valueOf("no-local"); private static final Symbol NO_LOCAL = Symbol.valueOf("no-local");
@ -157,6 +159,7 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
this.protonConnection.collect(eventCollector); this.protonConnection.collect(eventCollector);
this.protonConnection.setOfferedCapabilities(getConnectionCapabilitiesOffered()); this.protonConnection.setOfferedCapabilities(getConnectionCapabilitiesOffered());
this.protonConnection.setProperties(getConnetionProperties());
updateTracer(); updateTracer();
} }
@ -171,6 +174,21 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
return new Symbol[]{ ANONYMOUS_RELAY }; return new Symbol[]{ ANONYMOUS_RELAY };
} }
/**
* Load and return a <code>Map<Symbol, Object></code> that contains the properties
* that this connection supplies to incoming connections.
*
* @return the properties that are offered to the incoming connection.
*/
protected Map<Symbol, Object> getConnetionProperties() {
Map<Symbol, Object> properties = new HashMap<Symbol, Object>();
properties.put(QUEUE_PREFIX, "queue://");
properties.put(TOPIC_PREFIX, "topic://");
return properties;
}
@Override @Override
public void updateTracer() { public void updateTracer() {
if (amqpTransport.isTrace()) { if (amqpTransport.isTrace()) {