Profiling driven changes:

 - made AMQShortString cache the toString() value

 - added static initializer to IoTransport to disable use of pooled
   byte buffers

 - modified IoSender to permit buffering

 - removed OutputHandler and eliminated intermediate Frame generation
   between Disassembler and Sender<ByteBuffer> (IoSender)

 - made Disassembler take advantage of IoSender's buffering

 - removed Header and Data as distinct protocol events, added Header
   and Body members to MessageTransfer

 - modified Assembler and Disassembler to decode/encode Header and
   Data directly to/from MessageTransfer

 - modified Disassembler to only write data if encoding of headers is
   successful

 - added Strings.toUTF8(String) -> byte[] to do proper UTF-8 encoding
   that is also fast for 7-bit ascii

 - modified JMSTextMessage to use the Strings.toUTF8

 - modified QpidBench to only generate 7-bit ascii when using
   TextMessage


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@682887 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 3 deletions

diff --git a/qpid/java/common/genutil.py b/qpid/java/common/genutil.py
index 2f1caa41c4..f8f234548c 100644
--- a/qpid/java/common/genutil.py
+++ b/qpid/java/common/genutil.py
@@ -170,18 +170,15 @@ class Field:
     if self.type_node.name == "struct":
       self.read = "(%s) dec.readStruct(%s.TYPE)" % (tname, tname)
       self.write = "enc.writeStruct(%s.TYPE, check(struct).%s)" % (tname, self.name)
-      self.check = ""
       self.coder = "Struct"
     elif self.type_node.name == "domain":
       self.coder = camel(0, self.prim_type["@name"])
       self.read = "%s.get(dec.read%s())" % (tname, self.coder)
       self.write = "enc.write%s(check(struct).%s.getValue())" % (self.coder, self.name)
-      self.check = ""
     else:
       self.coder = camel(0, self.type_node["@name"])
       self.read = "dec.read%s()" % self.coder
       self.write = "enc.write%s(check(struct).%s)" % (self.coder, self.name)
-      self.check = "Validator.check%s(value);" % self.coder
     self.type = jtype(self.type_node)
     self.default = DEFAULTS.get(self.type, "null")
     self.has = camel(1, "has", self.name)
@@ -214,6 +211,9 @@ def get_parameters(type, fields):
       options = True
     else:
       params.append("%s %s" % (f.type, f.name))
+  if type["segments"]:
+    params.append("Header header")
+    params.append("ByteBuffer body")
   if options or type.name in ("control", "command"):
     params.append("Option ... _options")
   return params
@@ -226,6 +226,9 @@ def get_arguments(type, fields):
       options = True
     else:
       args.append(f.name)
+  if type["segments"]:
+    args.append("header")
+    args.append("body")
   if options or type.name in ("control", "command"):
     args.append("_options")
   return args