diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2007-01-30 16:40:41 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2007-01-30 16:40:41 +0000 |
| commit | 0a0d784009eadd3d7679a8cb6a73258562616af7 (patch) | |
| tree | d9ff386f7ec63c4d75b11999840a4911459c7fc1 /java/common | |
| parent | db6f152f26ae8de79b1aec55a16af401b97548d9 (diff) | |
| download | qpid-python-0a0d784009eadd3d7679a8cb6a73258562616af7.tar.gz | |
Separated the errata in the XML spec file and put them into a file amqp-errara.0-9.xml. Added this file to the codegen. Fixed minor codegen bug in which fields in merged classes have repeating ordinal numbers. Added missing mandatory field to Message.Transger in the new errata file.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@501456 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common')
| -rw-r--r-- | java/common/protocol-version.xml | 4 | ||||
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/framing/RequestManager.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml index 711efc4481..f70e1263bd 100644 --- a/java/common/protocol-version.xml +++ b/java/common/protocol-version.xml @@ -27,8 +27,8 @@ <property name="generated.dir" location="${generated.path}/${generated.package}" /> <property name="generated.timestamp" location="${generated.dir}/timestamp" /> <property name="xml.spec.dir" location="${topDirectoryLocation}/../specs" /> - <property name="xml.spec.deps" value="amqp.0-9.xml cluster.0-9.xml exchange-bound.0-9.xml amqp-nogen.0-9.xml" /> - <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/cluster.0-9.xml ${xml.spec.dir}/exchange-bound.0-9.xml ${xml.spec.dir}/amqp-nogen.0-9.xml" /> + <property name="xml.spec.deps" value="amqp.0-9.xml amqp-errata.0-9.xml cluster.0-9.xml exchange-bound.0-9.xml amqp-nogen.0-9.xml" /> + <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/amqp-errata.0-9.xml ${xml.spec.dir}/cluster.0-9.xml ${xml.spec.dir}/exchange-bound.0-9.xml ${xml.spec.dir}/amqp-nogen.0-9.xml" /> <target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired"> <mkdir dir="${generated.dir}"/> diff --git a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java index cd63a60c04..836c4ad985 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java +++ b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java @@ -75,8 +75,6 @@ public class RequestManager long requestId = getNextRequestId(); // Get new request ID AMQFrame requestFrame = AMQRequestBody.createAMQFrame(channel, requestId, lastProcessedResponseId, requestMethodBody); - requestSentMap.put(requestId, methodListener); - protocolWriter.writeFrame(requestFrame); if (logger.isDebugEnabled()) { logger.debug((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + @@ -84,6 +82,8 @@ public class RequestManager } //System.out.println((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + // "] TX REQ: Req[" + requestId + " " + lastProcessedResponseId + "]; " + requestMethodBody); + requestSentMap.put(requestId, methodListener); + protocolWriter.writeFrame(requestFrame); return requestId; } |