You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2007/01/30 17:27:48 UTC
svn commit: r501448 - in
/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools:
AmqpClass.java AmqpMethod.java Main.java
Author: kpvdr
Date: Tue Jan 30 08:27:47 2007
New Revision: 501448
URL: http://svn.apache.org/viewvc?view=rev&rev=501448
Log:
Fixed codegen bug in which fields added by second XML file duplicate ordinal values.
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
Modified: incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java?view=diff&rev=501448&r1=501447&r2=501448
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java (original)
+++ incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java Tue Jan 30 08:27:47 2007
@@ -59,7 +59,7 @@
indexMap.put(index, indexVersionSet);
}
NodeList nList = classNode.getChildNodes();
- int fieldCntr = 0;
+ int fieldCntr = fieldMap.size();
for (int i=0; i<nList.getLength(); i++)
{
Node child = nList.item(i);
@@ -82,7 +82,6 @@
thisField.removeVersion(version);
fieldMap.remove(fieldName);
}
- fieldCntr++;
}
else if (child.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
{
@@ -94,7 +93,7 @@
thisMethod = new AmqpMethod(methodName, converter);
methodMap.put(methodName, thisMethod);
}
- if (!thisMethod.addFromNode(child, fieldCntr++, version))
+ if (!thisMethod.addFromNode(child, fieldCntr, version))
{
String className = converter.prepareClassName(Utils.getNamedAttribute(classNode,
Utils.ATTRIBUTE_NAME));
Modified: incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java?view=diff&rev=501448&r1=501447&r2=501448
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java (original)
+++ incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java Tue Jan 30 08:27:47 2007
@@ -63,7 +63,7 @@
indexMap.put(index, indexVersionSet);
}
NodeList nList = methodNode.getChildNodes();
- int fieldCntr = 0;
+ int fieldCntr = fieldMap.size();
for (int i=0; i<nList.getLength(); i++)
{
Node child = nList.item(i);
Modified: incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java?view=diff&rev=501448&r1=501447&r2=501448
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java (original)
+++ incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java Tue Jan 30 08:27:47 2007
@@ -240,7 +240,7 @@
new File(tmplDir + Utils.fileSeparator + "AMQP_Constants.h.tmpl"),
new File(tmplDir + Utils.fileSeparator + "AMQP_MethodVersionMap.h.tmpl"),
new File(tmplDir + Utils.fileSeparator + "AMQP_MethodVersionMap.cpp.tmpl"),
- new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.h.tmpl")
+ new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.h.tmpl")
};
methodTemplateFiles = new File[]
{