You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/10/13 02:58:47 UTC
svn commit: r1631275 [2/3] - in
/qpid/branches/QPID-6125-ProtocolRefactoring/java:
broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/
client/src/main/java/org/apache/qpid/client/protocol/
common/src/main/java/org/apach...
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java Mon Oct 13 00:58:45 2014
@@ -125,13 +125,17 @@ public class BasicGetBody extends AMQMet
return buf.toString();
}
- public static void process(final int channelId, final MarkableDataInput buffer, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput buffer,
+ final ServerChannelMethodProcessor dispatcher)
throws IOException
{
int ticket = buffer.readUnsignedShort();
AMQShortString queue = buffer.readAMQShortString();
boolean noAck = (buffer.readByte() & 0x01) != 0;
- dispatcher.receiveBasicGet(channelId, queue, noAck);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicGet(queue, noAck);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java Mon Oct 13 00:58:45 2014
@@ -96,11 +96,13 @@ public class BasicGetEmptyBody extends A
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ClientChannelMethodProcessor dispatcher) throws IOException
{
AMQShortString clusterId = buffer.readAMQShortString();
- dispatcher.receiveBasicGetEmpty(channelId);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicGetEmpty();
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java Mon Oct 13 00:58:45 2014
@@ -151,15 +151,17 @@ public class BasicGetOkBody extends AMQM
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ClientChannelMethodProcessor dispatcher) throws IOException
{
long deliveryTag = buffer.readLong();
boolean redelivered = (buffer.readByte() & 0x01) != 0;
AMQShortString exchange = buffer.readAMQShortString();
AMQShortString routingKey = buffer.readAMQShortString();
long messageCount = EncodingUtils.readUnsignedInteger(buffer);
- dispatcher.receiveBasicGetOk(channelId, deliveryTag, redelivered, exchange, routingKey, messageCount);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicGetOk(deliveryTag, redelivered, exchange, routingKey, messageCount);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java Mon Oct 13 00:58:45 2014
@@ -151,9 +151,8 @@ public class BasicPublishBody extends AM
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ServerChannelMethodProcessor dispatcher) throws IOException
{
int ticket = buffer.readUnsignedShort();
@@ -163,6 +162,9 @@ public class BasicPublishBody extends AM
boolean mandatory = (bitfield & 0x01) != 0;
boolean immediate = (bitfield & 0x02) != 0;
- dispatcher.receiveBasicPublish(channelId, exchange, routingKey, mandatory, immediate);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicPublish(exchange, routingKey, mandatory, immediate);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java Mon Oct 13 00:58:45 2014
@@ -124,14 +124,16 @@ public class BasicQosBody extends AMQMet
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ServerChannelMethodProcessor dispatcher) throws IOException
{
long prefetchSize = EncodingUtils.readUnsignedInteger(buffer);
int prefetchCount = buffer.readUnsignedShort();
boolean global = (buffer.readByte() & 0x01) == 0x01;
- dispatcher.receiveBasicQos(channelId, prefetchSize, prefetchCount, global);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicQos(prefetchSize, prefetchCount, global);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java Mon Oct 13 00:58:45 2014
@@ -100,14 +100,16 @@ public class BasicRecoverBody extends AM
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput in,
- final ProtocolVersion protocolVersion,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput in,
+ final ProtocolVersion protocolVersion,
+ final ServerChannelMethodProcessor dispatcher) throws IOException
{
boolean requeue = (in.readByte() & 0x01) == 0x01;
boolean sync = (ProtocolVersion.v8_0.equals(protocolVersion));
- dispatcher.receiveBasicRecover(channelId, requeue, sync);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicRecover(requeue, sync);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java Mon Oct 13 00:58:45 2014
@@ -103,11 +103,13 @@ public class BasicRecoverSyncBody extend
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput in,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput in,
+ final ServerChannelMethodProcessor dispatcher) throws IOException
{
boolean requeue = (in.readByte() & 0x01) == 0x01;
- dispatcher.receiveBasicRecover(channelId, requeue, true);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicRecover(requeue, true);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java Mon Oct 13 00:58:45 2014
@@ -112,13 +112,15 @@ public class BasicRejectBody extends AMQ
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ServerChannelMethodProcessor dispatcher) throws IOException
{
long deliveryTag = buffer.readLong();
boolean requeue = (buffer.readByte() & 0x01) != 0;
- dispatcher.receiveBasicReject(channelId, deliveryTag, requeue);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicReject(deliveryTag, requeue);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java Mon Oct 13 00:58:45 2014
@@ -134,15 +134,17 @@ public class BasicReturnBody extends AMQ
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ClientChannelMethodProcessor dispatcher) throws IOException
{
int replyCode = buffer.readUnsignedShort();
AMQShortString replyText = buffer.readAMQShortString();
AMQShortString exchange = buffer.readAMQShortString();
AMQShortString routingKey = buffer.readAMQShortString();
- dispatcher.receiveBasicReturn(channelId, replyCode, replyText, exchange, routingKey);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveBasicReturn(replyCode, replyText, exchange, routingKey);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java Mon Oct 13 00:58:45 2014
@@ -121,13 +121,17 @@ public class ChannelAlertBody extends AM
return buf.toString();
}
- public static void process(final int channelId, final MarkableDataInput buffer, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput buffer,
+ final ClientChannelMethodProcessor dispatcher)
throws IOException, AMQFrameDecodingException
{
int replyCode = buffer.readUnsignedShort();
AMQShortString replyText = buffer.readAMQShortString();
FieldTable details = EncodingUtils.readFieldTable(buffer);
- dispatcher.receiveChannelAlert(channelId, replyCode, replyText, details);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveChannelAlert(replyCode, replyText, details);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java Mon Oct 13 00:58:45 2014
@@ -132,15 +132,17 @@ public class ChannelCloseBody extends AM
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ChannelMethodProcessor dispatcher) throws IOException
{
int replyCode = buffer.readUnsignedShort();
AMQShortString replyText = buffer.readAMQShortString();
int classId = buffer.readUnsignedShort();
int methodId = buffer.readUnsignedShort();
- dispatcher.receiveChannelClose(channelId, replyCode, replyText, classId, methodId);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveChannelClose(replyCode, replyText, classId, methodId);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java Mon Oct 13 00:58:45 2014
@@ -92,11 +92,13 @@ public class ChannelFlowBody extends AMQ
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer,
+ final ChannelMethodProcessor dispatcher) throws IOException
{
boolean active = (buffer.readByte() & 0x01) == 0x01;
- dispatcher.receiveChannelFlow(channelId, active);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveChannelFlow(active);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java Mon Oct 13 00:58:45 2014
@@ -93,10 +93,14 @@ public class ChannelFlowOkBody extends A
return buf.toString();
}
- public static void process(final int channelId, final MarkableDataInput buffer, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput buffer,
+ final ChannelMethodProcessor dispatcher)
throws IOException
{
boolean active = (buffer.readByte() & 0x01) == 0x01;
- dispatcher.receiveChannelFlowOk(channelId, active);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveChannelFlowOk(active);
+ }
}
}
Added: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java?rev=1631275&view=auto
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java (added)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java Mon Oct 13 00:58:45 2014
@@ -0,0 +1,38 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.framing;
+
+public interface ChannelMethodProcessor
+{
+ void receiveChannelFlow(boolean active);
+
+ void receiveChannelFlowOk(boolean active);
+
+ void receiveChannelClose(int replyCode, AMQShortString replyText, int classId, int methodId);
+
+ void receiveChannelCloseOk();
+
+ void receiveMessageContent(byte[] data);
+
+ void receiveMessageHeader(BasicContentHeaderProperties properties, long bodySize);
+
+ boolean ignoreAllButCloseOk();
+}
Propchange: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java Mon Oct 13 00:58:45 2014
@@ -84,9 +84,12 @@ public class ChannelOpenBody extends AMQ
public static void process(final int channelId,
final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException
+ final ServerMethodProcessor dispatcher) throws IOException
{
buffer.readAMQShortString();
- dispatcher.receiveChannelOpen(channelId);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveChannelOpen(channelId);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java Mon Oct 13 00:58:45 2014
@@ -96,16 +96,18 @@ public class ChannelOpenOkBody extends A
return "[ChannelOpenOkBody]";
}
- public static void process(final int channelId,
- final MarkableDataInput in,
- final ProtocolVersion protocolVersion,
- final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput in,
+ final ProtocolVersion protocolVersion,
+ final ClientChannelMethodProcessor dispatcher) throws IOException
{
if(!ProtocolVersion.v8_0.equals(protocolVersion))
{
EncodingUtils.readBytes(in);
}
- dispatcher.receiveChannelOpenOk(channelId);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveChannelOpenOk();
+ }
}
}
Added: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java?rev=1631275&view=auto
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java (added)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java Mon Oct 13 00:58:45 2014
@@ -0,0 +1,78 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.framing;
+
+public interface ClientChannelMethodProcessor extends ChannelMethodProcessor
+{
+ void receiveChannelOpenOk();
+
+ void receiveChannelAlert(int replyCode, final AMQShortString replyText, FieldTable details);
+
+ void receiveAccessRequestOk(int ticket);
+
+ void receiveExchangeDeclareOk();
+
+ void receiveExchangeDeleteOk();
+
+ void receiveExchangeBoundOk(int replyCode, AMQShortString replyText);
+
+ void receiveQueueBindOk();
+
+ void receiveQueueUnbindOk();
+
+ void receiveQueueDeclareOk(final AMQShortString queue, long messageCount, long consumerCount);
+
+ void receiveQueuePurgeOk(long messageCount);
+
+ void receiveQueueDeleteOk(long messageCount);
+
+ void receiveBasicRecoverSyncOk();
+
+ void receiveBasicQosOk();
+
+ void receiveBasicConsumeOk(AMQShortString consumerTag);
+
+ void receiveBasicCancelOk(AMQShortString consumerTag);
+
+ void receiveBasicReturn(int replyCode,
+ AMQShortString replyText,
+ AMQShortString exchange,
+ AMQShortString routingKey);
+
+ void receiveBasicDeliver(AMQShortString consumerTag,
+ long deliveryTag,
+ boolean redelivered,
+ AMQShortString exchange, AMQShortString routingKey);
+
+ void receiveBasicGetOk(long deliveryTag,
+ boolean redelivered,
+ AMQShortString exchange,
+ AMQShortString routingKey, long messageCount);
+
+ void receiveBasicGetEmpty();
+
+ void receiveTxSelectOk();
+
+ void receiveTxCommitOk();
+
+ void receiveTxRollbackOk();
+
+}
Propchange: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java?rev=1631275&view=auto
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java (added)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java Mon Oct 13 00:58:45 2014
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.framing;
+
+public interface ClientMethodProcessor<T extends ClientChannelMethodProcessor> extends MethodProcessor<T>
+{
+ void receiveConnectionStart(short versionMajor,
+ short versionMinor,
+ FieldTable serverProperties,
+ byte[] mechanisms,
+ byte[] locales);
+
+ void receiveConnectionSecure(byte[] challenge);
+
+ void receiveConnectionRedirect(AMQShortString host, AMQShortString knownHosts);
+
+ void receiveConnectionTune(int channelMax, long frameMax, int heartbeat);
+
+ void receiveConnectionOpenOk(AMQShortString knownHosts);
+
+}
Propchange: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java Mon Oct 13 00:58:45 2014
@@ -121,12 +121,15 @@ public class ConnectionOpenBody extends
return buf.toString();
}
- public static void process(final MarkableDataInput buffer, final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer, final ServerMethodProcessor dispatcher) throws IOException
{
AMQShortString virtualHost = buffer.readAMQShortString();
AMQShortString capabilities = buffer.readAMQShortString();
boolean insist = (buffer.readByte() & 0x01) == 0x01;
- dispatcher.receiveConnectionOpen(virtualHost, capabilities, insist);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionOpen(virtualHost, capabilities, insist);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java Mon Oct 13 00:58:45 2014
@@ -96,10 +96,13 @@ public class ConnectionOpenOkBody extend
return buf.toString();
}
- public static void process(final MarkableDataInput buffer, final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer, final ClientMethodProcessor dispatcher) throws IOException
{
AMQShortString knownHosts = buffer.readAMQShortString();
- dispatcher.receiveConnectionOpenOk(knownHosts);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionOpenOk(knownHosts);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java Mon Oct 13 00:58:45 2014
@@ -108,10 +108,13 @@ public class ConnectionRedirectBody exte
return buf.toString();
}
- public static void process(final MarkableDataInput buffer, final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer, final ClientMethodProcessor dispatcher) throws IOException
{
AMQShortString host = buffer.readAMQShortString();
AMQShortString knownHosts = buffer.readAMQShortString();
- dispatcher.receiveConnectionRedirect(host, knownHosts);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionRedirect(host, knownHosts);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java Mon Oct 13 00:58:45 2014
@@ -96,11 +96,14 @@ public class ConnectionSecureBody extend
return buf.toString();
}
- public static void process(final MarkableDataInput in, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput in, final ClientMethodProcessor dispatcher)
throws IOException, AMQFrameDecodingException
{
byte[] challenge = EncodingUtils.readBytes(in);
- dispatcher.receiveConnectionSecure(challenge);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionSecure(challenge);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java Mon Oct 13 00:58:45 2014
@@ -96,9 +96,12 @@ public class ConnectionSecureOkBody exte
return buf.toString();
}
- public static void process(final MarkableDataInput in, final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput in, final ServerMethodProcessor dispatcher) throws IOException
{
byte[] response = EncodingUtils.readBytes(in);
- dispatcher.receiveConnectionSecureOk(response);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionSecureOk(response);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java Mon Oct 13 00:58:45 2014
@@ -136,7 +136,7 @@ public class ConnectionStartBody extends
return buf.toString();
}
- public static void process(final MarkableDataInput in, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput in, final ClientMethodProcessor dispatcher)
throws IOException, AMQFrameDecodingException
{
short versionMajor = (short) in.readUnsignedByte();
@@ -145,7 +145,9 @@ public class ConnectionStartBody extends
byte[] mechanisms = EncodingUtils.readBytes(in);
byte[] locales = EncodingUtils.readBytes(in);
-
- dispatcher.receiveConnectionStart(versionMajor, versionMinor, serverProperties, mechanisms, locales);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionStart(versionMajor, versionMinor, serverProperties, mechanisms, locales);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java Mon Oct 13 00:58:45 2014
@@ -126,7 +126,7 @@ public class ConnectionStartOkBody exten
return buf.toString();
}
- public static void process(final MarkableDataInput in, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput in, final ServerMethodProcessor dispatcher)
throws IOException, AMQFrameDecodingException
{
@@ -134,7 +134,9 @@ public class ConnectionStartOkBody exten
AMQShortString mechanism = in.readAMQShortString();
byte[] response = EncodingUtils.readBytes(in);
AMQShortString locale = in.readAMQShortString();
-
- dispatcher.receiveConnectionStartOk(clientProperties, mechanism, response, locale);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionStartOk(clientProperties, mechanism, response, locale);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java Mon Oct 13 00:58:45 2014
@@ -119,12 +119,15 @@ public class ConnectionTuneBody extends
return buf.toString();
}
- public static void process(final MarkableDataInput buffer, final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer, final ClientMethodProcessor dispatcher) throws IOException
{
int channelMax = buffer.readUnsignedShort();
long frameMax = EncodingUtils.readUnsignedInteger(buffer);
int heartbeat = buffer.readUnsignedShort();
- dispatcher.receiveConnectionTune(channelMax, frameMax, heartbeat);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionTune(channelMax, frameMax, heartbeat);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java Mon Oct 13 00:58:45 2014
@@ -119,12 +119,15 @@ public class ConnectionTuneOkBody extend
return buf.toString();
}
- public static void process(final MarkableDataInput buffer, final MethodProcessor dispatcher) throws IOException
+ public static void process(final MarkableDataInput buffer, final ServerMethodProcessor dispatcher) throws IOException
{
int channelMax = buffer.readUnsignedShort();
long frameMax = EncodingUtils.readUnsignedInteger(buffer);
int heartbeat = buffer.readUnsignedShort();
- dispatcher.receiveConnectionTuneOk(channelMax, frameMax, heartbeat);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveConnectionTuneOk(channelMax, frameMax, heartbeat);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java Mon Oct 13 00:58:45 2014
@@ -21,7 +21,6 @@
package org.apache.qpid.framing;
import java.io.DataInput;
-import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -73,33 +72,20 @@ public class ContentBody implements AMQB
session.contentBodyReceived(channelId, this);
}
- protected void populateFromBuffer(DataInputStream buffer, long size) throws AMQFrameDecodingException, IOException
- {
- if (size > 0)
- {
- _payload = new byte[(int)size];
- buffer.read(getPayload());
- }
-
- }
-
- public void reduceBufferToFit()
- {
- }
-
public byte[] getPayload()
{
return _payload;
}
- public static void process(final int channel,
- final MarkableDataInput in,
- final MethodProcessor methodProcessor, final long bodySize)
+ public static void process(final MarkableDataInput in,
+ final ChannelMethodProcessor methodProcessor, final long bodySize)
throws IOException
{
+
byte[] payload = new byte[(int)bodySize];
in.readFully(payload);
- methodProcessor.receiveMessageContent(channel, payload);
+
+ methodProcessor.receiveMessageContent(payload);
}
private static class BufferContentBody implements AMQBody
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java Mon Oct 13 00:58:45 2014
@@ -155,9 +155,8 @@ public class ContentHeaderBody implement
_bodySize = bodySize;
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor methodProcessor, final long size)
+ public static void process(final MarkableDataInput buffer,
+ final ChannelMethodProcessor methodProcessor, final long size)
throws IOException, AMQFrameDecodingException
{
@@ -168,13 +167,13 @@ public class ContentHeaderBody implement
BasicContentHeaderProperties properties;
- if (classId != BasicConsumeBody.CLASS_ID)
+ if (classId != CLASS_ID)
{
throw new AMQFrameDecodingException(null, "Unsupported content header class id: " + classId, null);
}
- properties = new BasicContentHeaderProperties();
+ properties = new BasicContentHeaderProperties();
properties.populatePropertiesFromBuffer(buffer, propertyFlags, (int)(size-14));
- methodProcessor.receiveMessageHeader(channelId, properties, bodySize);
+ methodProcessor.receiveMessageHeader(properties, bodySize);
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java Mon Oct 13 00:58:45 2014
@@ -122,13 +122,17 @@ public class ExchangeBoundBody extends A
return buf.toString();
}
- public static void process(final int channelId, final MarkableDataInput buffer, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput buffer,
+ final ServerChannelMethodProcessor dispatcher)
throws IOException
{
AMQShortString exchange = buffer.readAMQShortString();
AMQShortString routingKey = buffer.readAMQShortString();
AMQShortString queue = buffer.readAMQShortString();
- dispatcher.receiveExchangeBound(channelId, exchange, routingKey, queue);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveExchangeBound(exchange, routingKey, queue);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java Mon Oct 13 00:58:45 2014
@@ -115,12 +115,16 @@ public class ExchangeBoundOkBody extends
return buf.toString();
}
- public static void process(final int channelId, final MarkableDataInput buffer, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput buffer,
+ final ClientChannelMethodProcessor dispatcher)
throws IOException
{
int replyCode = buffer.readUnsignedShort();
AMQShortString replyText = buffer.readAMQShortString();
- dispatcher.receiveExchangeBoundOk(channelId, replyCode, replyText);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveExchangeBoundOk(replyCode, replyText);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java Mon Oct 13 00:58:45 2014
@@ -204,9 +204,8 @@ public class ExchangeDeclareBody extends
return buf.toString();
}
- public static void process(final int channelId,
- final MarkableDataInput buffer,
- final MethodProcessor dispatcher) throws IOException, AMQFrameDecodingException
+ public static void process(final MarkableDataInput buffer,
+ final ServerChannelMethodProcessor dispatcher) throws IOException, AMQFrameDecodingException
{
int ticket = buffer.readUnsignedShort();
@@ -219,14 +218,16 @@ public class ExchangeDeclareBody extends
boolean internal = (bitfield & 0x8) == 0x8;
boolean nowait = (bitfield & 0x10) == 0x10;
FieldTable arguments = EncodingUtils.readFieldTable(buffer);
- dispatcher.receiveExchangeDeclare(channelId,
- exchange,
- type,
- passive,
- durable,
- autoDelete,
- internal,
- nowait,
- arguments);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveExchangeDeclare(exchange,
+ type,
+ passive,
+ durable,
+ autoDelete,
+ internal,
+ nowait,
+ arguments);
+ }
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java?rev=1631275&r1=1631274&r2=1631275&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java Mon Oct 13 00:58:45 2014
@@ -138,7 +138,8 @@ public class ExchangeDeleteBody extends
return buf.toString();
}
- public static void process(final int channelId, final MarkableDataInput buffer, final MethodProcessor dispatcher)
+ public static void process(final MarkableDataInput buffer,
+ final ServerChannelMethodProcessor dispatcher)
throws IOException
{
@@ -147,6 +148,9 @@ public class ExchangeDeleteBody extends
byte bitfield = buffer.readByte();
boolean ifUnused = (bitfield & 0x01) == 0x01;
boolean nowait = (bitfield & 0x02) == 0x02;
- dispatcher.receiveExchangeDelete(channelId, exchange, ifUnused, nowait);
+ if(!dispatcher.ignoreAllButCloseOk())
+ {
+ dispatcher.receiveExchangeDelete(exchange, ifUnused, nowait);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org