[PATCH] Reduce number of AttributeHandlers

[Pavel Ausianik]

Index: Body.java
===================================================================
RCS file: /home/cvspublic/xml-soap/java/src/org/apache/soap/Body.java,v
retrieving revision 1.9
diff -u -r1.9 Body.java
--- Body.java   6 Nov 2002 15:11:08 -0000       1.9
+++ Body.java   14 Nov 2002 15:42:09 -0000
@@ -78,7 +78,15 @@
 public class Body
 {
   private Vector           bodyEntries = null;
-  private AttributeHandler attrHandler = new AttributeHandler();
+  private AttributeHandler attrHandler = null;
+
+  public Body() {
+      attrHandler = new AttributeHandler();
+  }
+
+  public Body(AttributeHandler attrHandler) {
+      this.attrHandler = attrHandler;
+  }
 
   public void setAttribute(QName attrQName, String value)
   {
@@ -201,11 +209,11 @@
   public static Body unmarshall(Node src, SOAPContext ctx) throws 
IllegalArgumentException
   {
     Element root         = (Element)src;
-    Body    body         = new Body();
     Vector  bodyEntries  = new Vector();
 
     // Deserialize any body attributes.
-    body.attrHandler = AttributeHandler.unmarshall(root, ctx);
+    AttributeHandler attrHandler = AttributeHandler.unmarshall(root, ctx);
+    Body    body         = new Body(attrHandler);
 
     for (Element el = DOMUtils.getFirstChildElement(root);
                  el != null;
Index: Envelope.java
===================================================================
RCS file: /home/cvspublic/xml-soap/java/src/org/apache/soap/Envelope.java,v
retrieving revision 1.11
diff -u -r1.11 Envelope.java
--- Envelope.java       6 Nov 2002 15:11:08 -0000       1.11
+++ Envelope.java       14 Nov 2002 15:43:16 -0000
@@ -77,7 +77,7 @@
   private Header           header          = null;
   private Body             body            = null;
   private Vector           envelopeEntries = null;
-  private AttributeHandler attrHandler     = new AttributeHandler();
+  private AttributeHandler attrHandler = null;
 
   private static final QName N_SOAP_ENV = new QName(Constants.NS_URI_XMLNS,  
Constants.NS_PRE_SOAP_ENV);
   private static final QName N_SCHEMA_XSI = new QName(Constants.NS_URI_XMLNS,  
Constants.NS_PRE_SCHEMA_XSI);
@@ -86,6 +86,7 @@
 
   public Envelope()
   {
+    attrHandler = new AttributeHandler();
     // Declare the "SOAP-ENV" namespace.
     setAttribute(N_SOAP_ENV, Constants.NS_URI_SOAP_ENV);
 
@@ -96,6 +97,10 @@
     setAttribute(N_SCHEMA_XSD, Constants.NS_URI_CURRENT_SCHEMA_XSD);
   }
 
+  public Envelope(AttributeHandler attrHandler) {
+      this.attrHandler = attrHandler;
+  }
+
   public void setAttribute(QName attrQName, String value)
   {
     attrHandler.setAttribute(attrQName, value);
@@ -237,7 +242,7 @@
     throws IllegalArgumentException
   {
     Element  root = (Element)src;
-    Envelope env  = new Envelope();
+    Envelope env  = new Envelope(null);
 
     if (Constants.Q_ELEM_ENVELOPE.matches(root))
     {


--
To unsubscribe, e-mail:   <mailto:soap-dev-unsubscribe@;xml.apache.org>
For additional commands, e-mail: <mailto:soap-dev-help@;xml.apache.org>