2003/11/17 01:53:25

[org.ibex.core.git] / src / org / xwt / SOAP.java

diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java
index 59fc5c0..113e01b 100644 (file)
--- a/src/org/xwt/SOAP.java
+++ b/src/org/xwt/SOAP.java
@@ -43,7 +43,7 @@ class SOAP extends XMLRPC {
         if (name.equals("SOAP-ENV:Fault")) fault = true;
  
         // add a generic struct; we'll change this if our type is different
-        objects.addElement(new JSObj());
+        objects.addElement(new JS());
 
         for(int i=0; i<keys.length; i++) {
             String key = keys[i];
@@ -92,7 +92,7 @@ class SOAP extends XMLRPC {
 
             } else if (me instanceof byte[]) {
                 objects.removeElementAt(objects.size() - 1);
-                objects.addElement(new Res.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size()))));
+                objects.addElement(new Res.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size())), null));
                 content.reset();                
 
             } else if (me instanceof Integer) {
@@ -233,7 +233,7 @@ class SOAP extends XMLRPC {
             Enumeration e = j.keys();
             while(e.hasMoreElements()) {
                 Object key = e.nextElement();
-                appendObject(key, j.get(key), sb);
+                appendObject((String)key, j.get(key), sb);
             }
             sb.append("</" + name + ">\r\n");
 
@@ -259,7 +259,7 @@ class SOAP extends XMLRPC {
             Enumeration e = ((JS)args.elementAt(0)).keys();
             while(e.hasMoreElements()) {
                 Object key = e.nextElement();
-                appendObject(key, ((JS)args.elementAt(0)).get(key), content);
+                appendObject((String)key, ((JS)args.elementAt(0)).get(key), content);
             }
         }
         content.append("    </" + methodname + "></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n");