changes made after tupshins reconstruction

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

diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java
index 190d8b4..f3ce759 100644 (file)
--- a/src/org/xwt/SOAP.java
+++ b/src/org/xwt/SOAP.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.io.*;
@@ -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())), null));
+                objects.addElement(new Stream.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size())), null));
                 content.reset();                
 
             } else if (me instanceof Integer) {
@@ -181,10 +181,10 @@ class SOAP extends XMLRPC {
             sb.append(((Boolean)o).booleanValue() ? "true" : "false");
             sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof Res) {
+        } else if (o instanceof Stream) {
             try {
                 sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\r\n");
-                InputStream is = ((Res)o).getInputStream();
+                InputStream is = ((Stream)o).getInputStream();
                 byte[] buf = new byte[54];
                 while(true) {
                     int numread = is.read(buf, 0, 54);
@@ -201,8 +201,8 @@ class SOAP extends XMLRPC {
                 sb.append(((Boolean)o).booleanValue() ? "1" : "0");
                 sb.append("</" + name + ">\r\n");
             } catch (IOException e) {
-                if (Log.on) Log.log(this, "caught IOException while attempting to send a ByteStream via SOAP");
-                if (Log.on) Log.log(this, e);
+                if (Log.on) Log.info(this, "caught IOException while attempting to send a ByteStream via SOAP");
+                if (Log.on) Log.info(this, e);
                 throw new JSExn("caught IOException while attempting to send a ByteStream via SOAP");
             }