X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSOAP.java;h=02f358319008bc9be553d5e08688c47b7ddd171a;hb=027607da259f292060d80e0ed90d2b0e896acd86;hp=ade85e5e0c6f86f578e489ef0462afc3be20a329;hpb=55a705adbd2e74b771d6cbd161ee5e6f90bd5dac;p=org.ibex.core.git
diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java
index ade85e5..02f3583 100644
--- a/src/org/xwt/SOAP.java
+++ b/src/org/xwt/SOAP.java
@@ -91,7 +91,7 @@ class SOAP extends XMLRPC {
} else if (me instanceof byte[]) {
objects.removeElementAt(objects.size() - 1);
- objects.addElement(new String(Base64.decode(new String(content.getBuf(), 0, content.size()))));
+ objects.addElement(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))));
content.reset();
} else if (me instanceof Integer) {
@@ -159,7 +159,7 @@ class SOAP extends XMLRPC {
}
/** Appends the SOAP representation of o
to sb
*/
- void appendObject(String name, Object o, StringBuffer sb) {
+ void appendObject(String name, Object o, StringBuffer sb) throws JavaScriptException {
if (o instanceof Number) {
if ((double)((Number)o).intValue() == ((Number)o).doubleValue()) {
sb.append(" <" + name + " xsi:type=\"xsd:int\">");
@@ -176,6 +176,31 @@ class SOAP extends XMLRPC {
sb.append(((Boolean)o).booleanValue() ? "true" : "false");
sb.append("" + name + ">\n");
+ } else if (o instanceof ByteStream) {
+ try {
+ sb.append(" <" + name + " xsi:type=\"xsd:base64\">");
+ InputStream is = ((ByteStream)o).getInputStream();
+ byte[] buf = new byte[96];
+ while(true) {
+ int numread = is.read(buf, 0, 96);
+ if (numread == -1) break;
+ byte[] writebuf = buf;
+ if (numread < buf.length) {
+ writebuf = new byte[numread];
+ System.arraycopy(buf, 0, writebuf, 0, numread);
+ }
+ sb.append(" ");
+ sb.append(Base64.encode(writebuf));
+ sb.append("\n");
+ }
+ sb.append(((Boolean)o).booleanValue() ? "1" : "0");
+ sb.append("" + name + ">\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);
+ throw new JavaScriptException("caught IOException while attempting to send a ByteStream via SOAP");
+ }
+
} else if (o instanceof String) {
sb.append(" <" + name + " xsi:type=\"xsd:string\">");
String s = (String)o;