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

NO-JIRA Make the version string indicate that the value is unknown 

The default version string is out of date and doesn't indicate that a
proper value couldn't be found, return something that makes that a bit
more clear.
This commit is contained in:
Timothy Bish 2017-04-11 13:13:30 -04:00
parent af03ad4679
commit 1fd2450544
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
View File

@ -122,7 +122,7 @@ public class AmqpConnection implements AmqpProtocolConverter {
BROKER_PLATFORM = "Java/" + (javaVersion == null ? "unknown" : javaVersion); BROKER_PLATFORM = "Java/" + (javaVersion == null ? "unknown" : javaVersion);
InputStream in = null; InputStream in = null;
String version = "5.12.0"; String version = "<unknown-5.x>";
if ((in = AmqpConnection.class.getResourceAsStream("/org/apache/activemq/version.txt")) != null) { if ((in = AmqpConnection.class.getResourceAsStream("/org/apache/activemq/version.txt")) != null) {
BufferedReader reader = new BufferedReader(new InputStreamReader(in)); BufferedReader reader = new BufferedReader(new InputStreamReader(in));
try { try {
@ -152,9 +152,9 @@ public class AmqpConnection implements AmqpProtocolConverter {
private boolean closedSocket; private boolean closedSocket;
private AmqpAuthenticator authenticator; private AmqpAuthenticator authenticator;
private final Map<TransactionId, AmqpTransactionCoordinator> transactions = new HashMap<TransactionId, AmqpTransactionCoordinator>(); private final Map<TransactionId, AmqpTransactionCoordinator> transactions = new HashMap<>();
private final ConcurrentMap<Integer, ResponseHandler> resposeHandlers = new ConcurrentHashMap<Integer, ResponseHandler>(); private final ConcurrentMap<Integer, ResponseHandler> resposeHandlers = new ConcurrentHashMap<>();
private final ConcurrentMap<ConsumerId, AmqpSender> subscriptionsByConsumerId = new ConcurrentHashMap<ConsumerId, AmqpSender>(); private final ConcurrentMap<ConsumerId, AmqpSender> subscriptionsByConsumerId = new ConcurrentHashMap<>();
public AmqpConnection(AmqpTransport transport, BrokerService brokerService) { public AmqpConnection(AmqpTransport transport, BrokerService brokerService) {
this.amqpTransport = transport; this.amqpTransport = transport;
@ -199,7 +199,7 @@ public class AmqpConnection implements AmqpProtocolConverter {
* @return the properties that are offered to the incoming connection. * @return the properties that are offered to the incoming connection.
*/ */
protected Map<Symbol, Object> getConnetionProperties() { protected Map<Symbol, Object> getConnetionProperties() {
Map<Symbol, Object> properties = new HashMap<Symbol, Object>(); Map<Symbol, Object> properties = new HashMap<>();
properties.put(QUEUE_PREFIX, "queue://"); properties.put(QUEUE_PREFIX, "queue://");
properties.put(TOPIC_PREFIX, "topic://"); properties.put(TOPIC_PREFIX, "topic://");
@ -218,7 +218,7 @@ public class AmqpConnection implements AmqpProtocolConverter {
* @return the properties that are offered to the incoming connection. * @return the properties that are offered to the incoming connection.
*/ */
protected Map<Symbol, Object> getFailedConnetionProperties() { protected Map<Symbol, Object> getFailedConnetionProperties() {
Map<Symbol, Object> properties = new HashMap<Symbol, Object>(); Map<Symbol, Object> properties = new HashMap<>();
properties.put(CONNECTION_OPEN_FAILED, true); properties.put(CONNECTION_OPEN_FAILED, true);
@ -478,7 +478,7 @@ public class AmqpConnection implements AmqpProtocolConverter {
} else if (exception instanceof InvalidClientIDException) { } else if (exception instanceof InvalidClientIDException) {
ErrorCondition condition = new ErrorCondition(AmqpError.INVALID_FIELD, exception.getMessage()); ErrorCondition condition = new ErrorCondition(AmqpError.INVALID_FIELD, exception.getMessage());
Map<Symbol, Object> infoMap = new HashMap<Symbol, Object> (); Map<Symbol, Object> infoMap = new HashMap<> ();
infoMap.put(INVALID_FIELD, CONTAINER_ID); infoMap.put(INVALID_FIELD, CONTAINER_ID);
condition.setInfo(infoMap); condition.setInfo(infoMap);