X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSOAP.java;h=debbc241ea9945c9290b2a80410c9d524f9752ec;hb=a81a151e639664cb340cf3726f9e8b9c77d125fb;hp=bceb99b366545e53c7a3b2da4e07d34fbb4b0f4a;hpb=e58686eae8a823ed64ed0ec92c2274c41d90ec93;p=org.ibex.core.git

diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java
index bceb99b..debbc24 100644
--- a/src/org/xwt/SOAP.java
+++ b/src/org/xwt/SOAP.java
@@ -1,4 +1,4 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.io.*;
@@ -67,7 +67,7 @@ class SOAP extends XMLRPC {
                 } else if (value.endsWith("null")) {
                     objects.removeElementAt(objects.size() - 1);
                     objects.addElement(null);
-                } else if (value.endsWith("arrayType") || value.endsWith("Array") || key.endsWith("arrayType")) {
+                } else if (value.endsWith("arrayType") || value.endsWith("JS.Array") || key.endsWith("arrayType")) {
                     objects.removeElementAt(objects.size() - 1);
                     objects.addElement(new JS.Array());
                 }
@@ -92,9 +92,9 @@ class SOAP extends XMLRPC {
 
             } else if (me instanceof byte[]) {
                 objects.removeElementAt(objects.size() - 1);
-                objects.addElement(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))));
+                objects.addElement(new Res.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size()))));
                 content.reset();                
-                
+
             } else if (me instanceof Integer) {
                 objects.removeElementAt(objects.size() - 1);
                 objects.addElement(new Integer(new String(content.getBuf(), 0, content.size())));
@@ -177,10 +177,10 @@ class SOAP extends XMLRPC {
             sb.append(((Boolean)o).booleanValue() ? "true" : "false");
             sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof ByteStream) {
+        } else if (o instanceof Res) {
             try {
                 sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\r\n");
-                InputStream is = ((ByteStream)o).getInputStream();
+                InputStream is = ((Res)o).getInputStream();
                 byte[] buf = new byte[54];
                 while(true) {
                     int numread = is.read(buf, 0, 54);