Author: rhs
Date: Wed Jul 25 05:36:13 2007
New Revision: 559423
URL: http://svn.apache.org/viewvc?view=rev&rev=559423
Log:
minor bug fixes
Modified:
incubator/qpid/trunk/qpid/java/common/generate
Modified: incubator/qpid/trunk/qpid/java/common/generate
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/generate?view=diff&rev=559423&r1=559422&r2=559423
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/generate (original)
+++ incubator/qpid/trunk/qpid/java/common/generate Wed Jul 25 05:36:13 2007
@@ -13,8 +13,8 @@
out_pkg = sys.argv[2]
spec_file = sys.argv[3]
spec = mllib.xml_parse(spec_file)
-major = spec["amqp"]["@major"]
-minor = spec["amqp"]["@minor"]
+major = spec["amqp/@major"]
+minor = spec["amqp/@minor"]
isfx = "_v%s_%s" % (major, minor)
class Output:
@@ -33,7 +33,7 @@
if not os.path.exists(dir):
os.makedirs(dir)
file = os.path.join(dir, "%s.java" % self.name)
- out = open(file, "write")
+ out = open(file, "w")
print >> out, "package %s;" % self.package
print >> out
print >> out, "import java.util.Map;"
@@ -80,7 +80,7 @@
DOMAINS[d["@name"]] = d["@type"]
def resolve(type):
- if (DOMAINS.has_key(type)):
+ if DOMAINS.has_key(type) and DOMAINS[type] != type:
return resolve(DOMAINS[type])
else:
return type
