You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2007/09/20 19:35:36 UTC
svn commit: r577827 - /incubator/qpid/trunk/qpid/java/common/generate
Author: rhs
Date: Thu Sep 20 10:35:36 2007
New Revision: 577827
URL: http://svn.apache.org/viewvc?rev=577827&view=rev
Log:
added back access ticket to the encode/decode methods
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?rev=577827&r1=577826&r2=577827&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/generate (original)
+++ incubator/qpid/trunk/qpid/java/common/generate Thu Sep 20 10:35:36 2007
@@ -96,7 +96,6 @@
DOMAINS = {}
STRUCTS = {}
-EXCLUDE = {"access-ticket": True}
for d in spec.query["amqp/domain"]:
name = d["@name"]
@@ -131,6 +130,7 @@
self.track = track
self.content = content
self.fields = []
+ self.ticket = False
def result(self):
r = self.node["result"]
@@ -143,7 +143,10 @@
return name
def field(self, type, name):
- self.fields.append((type, name))
+ if name == "ticket":
+ self.ticket = True
+ else:
+ self.fields.append((type, name))
def impl(self, out):
out.line("public class %s extends %s {" % (self.name, self.base))
@@ -231,6 +234,8 @@
out.line()
out.line(" public void read(Decoder dec, byte major, byte minor) {")
+ if self.ticket:
+ out.line(" dec.readShort();")
for type, name in self.fields:
if TYPES.has_key(type):
out.line(" %s = dec.read%s();" % (name, camel(0, type)))
@@ -243,6 +248,8 @@
out.line()
out.line(" public void write(Encoder enc, byte major, byte minor) {")
+ if self.ticket:
+ out.line(" enc.writeShort(0);")
for type, name in self.fields:
if TYPES.has_key(type):
out.line(" enc.write%s(%s);" % (camel(0, type), name))
@@ -284,7 +291,6 @@
return ", ".join(args)
CLASSES = {"file": False, "basic": False, "stream": False, "tunnel": False}
-FIELDS = {"ticket": False}
class Visitor(mllib.transforms.Visitor):
@@ -328,7 +334,7 @@
struct = Struct(m, name, base, typecode,
TRACKS.get(m.parent["@name"], "Frame.L4"),
m["@content"] == "1")
- for f in m.query["field", lambda f: FIELDS.get(f["@name"], True)]:
+ for f in m.query["field"]:
type = resolve(f["@domain"])
name = camel(1, f["@name"])
struct.field(type, name)