objects.setElementAt(new Double(new String(content.getBuf(), 0, content.size())), objects.size() - 1);
else if (name.equals("base64"))
- objects.setElementAt(new String(Base64.decode(new String(content.getBuf(), 0, content.size()))), objects.size() - 1);
+ objects.setElementAt(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))), objects.size() - 1);
else if (name.equals("name"))
objects.addElement(new String(content.getBuf(), 0, content.size()));
sb.append(((Boolean)o).booleanValue() ? "1" : "0");
sb.append("</boolean></value>\n");
+ } else if (o instanceof ByteStream) {
+ try {
+ sb.append(" <value><base64>\n");
+ InputStream is = ((ByteStream)o).getInputStream();
+ byte[] buf = new byte[54];
+ while(true) {
+ int numread = is.read(buf, 0, 54);
+ 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(new String(Base64.encode(writebuf)));
+ sb.append("\n");
+ }
+ sb.append("\n </base64></value>\n");
+ } catch (IOException e) {
+ if (Log.on) Log.log(this, "caught IOException while attempting to send a ByteStream via XML-RPC");
+ if (Log.on) Log.log(this, e);
+ throw new JavaScriptException("caught IOException while attempting to send a ByteStream via XML-RPC");
+ }
+
} else if (o instanceof String) {
sb.append(" <value><string>");
String s = (String)o;
}
}
- private Object connect(Object[] args) throws JavaScriptException, IOException {
+ // this is synchronized in case multiple threads try to make a call on the same object... in the future, change this
+ // behavior to use pipelining.
+ public synchronized Object call(Object[] args) throws JavaScriptException, IOException {
if (Log.verbose) Log.log(this, "call to " + url + " : " + methodname);
+
+ if (tracker == null) tracker = new Hash();
+ else tracker.clear();
+
+ if (objects == null) objects = new Vec();
+ else objects.setSize(0);
+
HTTP http = new HTTP(url);
String content = send(args, http);
OutputStream os = new BufferedOutputStream(http.getOutputStream(content.length(), "text/xml"), 4000);
PrintWriter ps = !Log.verbose ?
new PrintWriter(os) :
- new PrintWriter(new FilterWriter(os)) {
+ new PrintWriter(new FilterWriter(new OutputStreamWriter(os)) {
public void write(int i) throws IOException {
super.write(i);
if (Log.on) Log.log(this, "send: " + ((char)i));
new BufferedReader(new FilterReader(new InputStreamReader(new Filter(http.getInputStream()))) {
public int read() throws IOException {
int i = super.read();
- System.out.println("X " + i);
if (Log.on) Log.log(this, "recv: " + ((char)i));
return i;
}
public int read(char[] c, int off, int len) throws IOException {
int ret = super.read(c, off, len);
- System.out.println("Y " + ret);
if (ret == -1) return ret;
if (Log.on) Log.log(this, "recv: " + new String(c, off, ret));
return ret;
return recieve(br);
}
- protected String send(Object[] args, HTTP http) throws JavaScriptException {
+ protected String send(Object[] args, HTTP http) throws JavaScriptException, IOException {
StringBuffer content = new StringBuffer();
content.append("<?xml version=\"1.0\"?>\n");
content.append(" <methodCall>\n");
public final Object call(Context cx, Scriptable scope, Scriptable thisObj, java.lang.Object[] args) throws JavaScriptException {
- if (tracker == null) tracker = new Hash();
- else tracker.clear();
-
- if (objects == null) objects = new Vec();
- else objects.setSize(0);
-
- // put ourselves in the background
- Thread thread = Thread.currentThread();
- if (!(thread instanceof ThreadMessage)) {
- if (Log.on) Log.log(this, "RPC calls may only be made from background threads");
- return null;
- }
- ThreadMessage mythread = (ThreadMessage)thread;
- mythread.setPriority(Thread.MIN_PRIORITY);
- mythread.done.release();
+ if (!ThreadMessage.suspendThread()) return null;
try {
- return connect(args);
-
+ return call(args);
} catch (IOException se) {
if (Log.on) Log.log(this, se);
if (Log.on) Log.log(this, " at " + cx.interpreterSourceFile + ":" + cx.interpreterLine);
if (Log.on) Log.log(this, " at " + cx.interpreterSourceFile + ":" + cx.interpreterLine);
}
throw jse;
-
} finally {
- // okay, let ourselves be brought to the foreground
- MessageQueue.add(mythread);
- mythread.setPriority(Thread.NORM_PRIORITY);
- mythread.go.block();
+ ThreadMessage.resumeThread();
}
}