Author: rgodfrey
Date: Tue Jul 7 22:49:30 2015
New Revision: 1689765
URL: http://svn.apache.org/r1689765
Log:
QPID-6624 : Address review comments from [~k-wall]
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java?rev=1689765&r1=1689764&r2=1689765&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
Tue Jul 7 22:49:30 2015
@@ -403,7 +403,14 @@ public class AmqpPortImpl extends Abstra
Protocol protocol = null;
if (defaultAmqpSupportedReply != null &&
defaultAmqpSupportedReply.length() != 0)
{
- protocol = Protocol.valueOf("AMQP_" +
defaultAmqpSupportedReply.substring(1));
+ try
+ {
+ protocol = Protocol.valueOf("AMQP_" +
defaultAmqpSupportedReply.substring(1));
+ }
+ catch(IllegalArgumentException e)
+ {
+ LOGGER.warn("The configured default reply ({}) is not a valid
value for a protocol. This value will be ignored", defaultAmqpSupportedReply);
+ }
}
final Set<Protocol> protocolSet = getProtocols();
if(protocol != null && !protocolSet.contains(protocol))
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java?rev=1689765&r1=1689764&r2=1689765&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
Tue Jul 7 22:49:30 2015
@@ -77,14 +77,6 @@ public class MultiVersionProtocolEngine
ProtocolEngineCreator[] creators,
final Runnable onCloseTask)
{
- if(defaultSupportedReply != null &&
!supported.contains(defaultSupportedReply))
- {
- _logger.warn("The configured default reply ({}) to an unsupported
protocol version initiation is not"
- + " supported on this port. Only the following
versions are supported: {}",
- defaultSupportedReply, supported);
- defaultSupportedReply = null;
- }
-
_id = id;
_broker = broker;
_supported = supported;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
