Author: rgodfrey
Date: Thu Nov 26 16:14:19 2009
New Revision: 884619
URL: http://svn.apache.org/viewvc?rev=884619&view=rev
Log:
Fixes for 0-9-1 support
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java?rev=884619&r1=884618&r2=884619&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
Thu Nov 26 16:14:19 2009
@@ -78,7 +78,7 @@
if (queue == null)
{
- throw body.getConnectionException(AMQConstant.NOT_FOUND, "No
default queue defined on channel and queue was null");
+ throw body.getChannelException(AMQConstant.NOT_FOUND, "No
default queue defined on channel and queue was null");
}
routingKey = body.getRoutingKey() == null ? null :
body.getRoutingKey().intern();
@@ -92,7 +92,7 @@
if (queue == null)
{
- throw body.getConnectionException(AMQConstant.NOT_FOUND, "Queue "
+ body.getQueue() + " does not exist.");
+ throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " +
body.getQueue() + " does not exist.");
}
final Exchange exch = exchangeRegistry.getExchange(body.getExchange());
if (exch == null)
@@ -118,7 +118,7 @@
{
if(e.getErrorCode() == AMQConstant.NOT_FOUND)
{
- throw
body.getConnectionException(AMQConstant.NOT_FOUND,e.getMessage(),e);
+ throw
body.getChannelException(AMQConstant.NOT_FOUND,e.getMessage(),e);
}
throw body.getChannelException(AMQConstant.CHANNEL_ERROR,
e.toString());
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=884619&r1=884618&r2=884619&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Thu Nov 26 16:14:19 2009
@@ -341,7 +341,7 @@
String locales = "en_US";
AMQMethodBody responseBody =
getMethodRegistry().createConnectionStartBody((short) getProtocolMajorVersion(),
-
(short) getProtocolMinorVersion(),
+
(short) pv.getActualMinorVersion(),
null,
mechanisms.getBytes(),
locales.getBytes());
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java?rev=884619&r1=884618&r2=884619&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
Thu Nov 26 16:14:19 2009
@@ -60,7 +60,7 @@
public AMQFrame getCloseFrame(int channel)
{
MethodRegistry reg = MethodRegistry.getMethodRegistry(new
ProtocolVersion(major,minor));
- return new AMQFrame(channel,
+ return new AMQFrame(0,
reg.createConnectionCloseBody(getErrorCode().getCode(),
new
AMQShortString(getMessage()),
_classId,
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java?rev=884619&r1=884618&r2=884619&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
Thu Nov 26 16:14:19 2009
@@ -54,7 +54,8 @@
public ProtocolInitiation(ProtocolVersion pv)
{
- this(AMQP_HEADER, CURRENT_PROTOCOL_CLASS,
+ this(AMQP_HEADER,
+ pv.equals(ProtocolVersion.v0_91) ? 0 : CURRENT_PROTOCOL_CLASS,
pv.equals(ProtocolVersion.v0_91) ? 0 : TCP_PROTOCOL_INSTANCE,
pv.equals(ProtocolVersion.v0_91) ? 9 : pv.getMajorVersion(),
pv.equals(ProtocolVersion.v0_91) ? 1 : pv.getMinorVersion());
@@ -159,11 +160,6 @@
}
}
}
- if (_protocolClass != CURRENT_PROTOCOL_CLASS)
- {
- throw new AMQProtocolClassException("Protocol class " +
CURRENT_PROTOCOL_CLASS + " was expected; received " +
- _protocolClass, null);
- }
ProtocolVersion pv;
@@ -171,7 +167,16 @@
if(_protocolInstance == 0 && _protocolMajor == 9 && _protocolMinor ==
1)
{
pv = ProtocolVersion.v0_91;
-
+ if (_protocolClass != 0)
+ {
+ throw new AMQProtocolClassException("Protocol class " + 0 + "
was expected; received " +
+ _protocolClass, null);
+ }
+ }
+ else if (_protocolClass != CURRENT_PROTOCOL_CLASS)
+ {
+ throw new AMQProtocolClassException("Protocol class " +
CURRENT_PROTOCOL_CLASS + " was expected; received " +
+ _protocolClass, null);
}
else if (_protocolInstance != TCP_PROTOCOL_INSTANCE)
{
Modified:
qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm?rev=884619&r1=884618&r2=884619&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm
(original)
+++ qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm Thu
Nov 26 16:14:19 2009
@@ -61,6 +61,17 @@
return _minorVersion;
}
+ public byte getActualMinorVersion()
+ {
+ return _minorVersion > 90 ? (byte) (_minorVersion / 10) :
_minorVersion;
+ }
+
+
+ public byte getRevisionVersion()
+ {
+ return _minorVersion > 90 ? (byte) (_minorVersion % 10) : (byte) 0;
+ }
+
public String toString()
{
return _stringFormat;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
