removed dependencies on the core

[org.ibex.net.git] / src / org / ibex / net / SOAP.java

diff --git a/src/org/ibex/net/SOAP.java b/src/org/ibex/net/SOAP.java
index 85670a3..b33bfb6 100644 (file)
--- a/src/org/ibex/net/SOAP.java
+++ b/src/org/ibex/net/SOAP.java
@@ -90,7 +90,7 @@ public class SOAP extends XMLRPC {
 
             } else if (me instanceof byte[]) {
                 objects.removeElementAt(objects.size() - 1);
-                objects.addElement(new Stream.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size())), null));
+                objects.addElement(new Fountain.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size())), null));
                 content.reset();                
 
             } else if (me instanceof Integer) {
@@ -179,10 +179,10 @@ public class SOAP extends XMLRPC {
             sb.append(((Boolean)o).booleanValue() ? "true" : "false");
             sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof Stream) {
+        } else if (o instanceof Fountain) {
             try {
                 sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\r\n");
-                InputStream is = ((Stream)o).getInputStream();
+                InputStream is = ((Fountain)o).getInputStream();
                 byte[] buf = new byte[54];
                 while(true) {
                     int numread = is.read(buf, 0, 54);
@@ -199,9 +199,9 @@ public class SOAP extends XMLRPC {
                 sb.append(((Boolean)o).booleanValue() ? "1" : "0");
                 sb.append("</" + name + ">\r\n");
             } catch (IOException e) {
-                if (Log.on) Log.info(this, "caught IOException while attempting to send a ByteStream via SOAP");
+                if (Log.on) Log.info(this, "caught IOException while attempting to send a Fountain via SOAP");
                 if (Log.on) Log.info(this, e);
-                throw new JSExn("caught IOException while attempting to send a ByteStream via SOAP");
+                throw new JSExn("caught IOException while attempting to send a Fountain via SOAP");
             }
 
         } else if (o instanceof String) {