Author: rgodfrey
Date: Mon Oct 20 21:04:14 2014
New Revision: 1633230
URL: http://svn.apache.org/r1633230
Log:
QPID-6125 : correct the behaviour of exchange declare where the exchange
already exists
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1633230&r1=1633229&r2=1633230&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Mon Oct 20 21:04:14 2014
@@ -2808,6 +2808,17 @@ public class AMQChannel
+ " to " + type + ".", getChannelId());
}
+ else
+ {
+ if (!nowait)
+ {
+ sync();
+ MethodRegistry methodRegistry =
_connection.getMethodRegistry();
+ AMQMethodBody responseBody =
methodRegistry.createExchangeDeclareOkBody();
+ _connection.writeFrame(responseBody.generateFrame(
+ getChannelId()));
+ }
+ }
}
catch (NoFactoryForTypeException e)
{
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1633230&r1=1633229&r2=1633230&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
Mon Oct 20 21:04:14 2014
@@ -313,9 +313,6 @@ public class AMQProtocolEngine implement
{
_decoder.decodeBuffer(msg);
receivedComplete();
-
- _sender.flush();
-
}
catch (ConnectionScopedRuntimeException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
