[android-xmlrpc] r30 committed - fixes iissue #41

[android...@googlecode.com]

Revision: 30
Author: pskink
Date: Wed Aug 22 05:23:11 2012
Log: fixes iissue #41
http://code.google.com/p/android-xmlrpc/source/detail?r=30

Modified:
/trunk/XMLRPC/src/org/xmlrpc/XMLRPCServerTest.java
/trunk/XMLRPC/src/org/xmlrpc/android/XMLRPCCommon.java
/trunk/XMLRPC/src/org/xmlrpc/android/XMLRPCServer.java

=======================================
--- /trunk/XMLRPC/src/org/xmlrpc/XMLRPCServerTest.java Wed Aug 22 01:13:10
2012
+++ /trunk/XMLRPC/src/org/xmlrpc/XMLRPCServerTest.java Wed Aug 22 05:23:11
2012
@@ -27,36 +27,17 @@
MethodCall call = server.readMethodCall(client);
String name = call.getMethodName();
if (name.equals("add")) {
- ArrayList<Object> params = call.getParams();
- // assume "add" method has two Integer params, so no
checks done
- int i0 = (Integer) params.get(0);
- int i1 = (Integer) params.get(1);
- server.respond(client, new Object[] {i0 + i1});
- } else
- if (name.equals("add1")) {
ArrayList<Object> params = call.getParams();
// assume "add" method has two Integer params, so no
checks done
int i0 = (Integer) params.get(0);
int i1 = (Integer) params.get(1);
server.respond(client, i0 + i1);
} else
- if (name.equals("test0")) {
- // returns 3 values: String, int and boolean
- server.respond(client, "returns 3 values: String, int
and boolean", 0, false);
- } else
- if (name.equals("test1")) {
- // returns 3 values: String, int and boolean
+ if (name.equals("test")) {
Object[] arr = new Object[] {
- "returns 3 values: String, int and boolean",
1, false
+ "String", 1, false
};
server.respond(client, arr);
- } else
- if (name.equals("test2")) {
- // returns 1 value: an array of String, int and boolean
- Object[] arr = new Object[] {
- "returns 1 value: an array of String, int and
boolean", 2, false
- };
- server.respond(client, (Object) arr);
} else {
server.respond(client, null);
}
=======================================
--- /trunk/XMLRPC/src/org/xmlrpc/android/XMLRPCCommon.java Mon Jan 4
16:08:50 2010
+++ /trunk/XMLRPC/src/org/xmlrpc/android/XMLRPCCommon.java Wed Aug 22
05:23:11 2012
@@ -26,9 +26,8 @@
iXMLRPCSerializer = serializer;
}

- protected void serializeParams(Object[] params) throws
IllegalArgumentException, IllegalStateException, IOException {
- if (params != null && params.length != 0)
- {
+ protected void serializeParams(Object... params) throws
IllegalArgumentException, IllegalStateException, IOException {
+ if (params != null && params.length != 0) {
// set method params
serializer.startTag(null, Tag.PARAMS);
for (int i=0; i<params.length; i++) {
=======================================
--- /trunk/XMLRPC/src/org/xmlrpc/android/XMLRPCServer.java Wed Aug 22
01:13:10 2012
+++ /trunk/XMLRPC/src/org/xmlrpc/android/XMLRPCServer.java Wed Aug 22
05:23:11 2012
@@ -75,9 +75,9 @@
return pullParser;
}

- public void respond(Socket socket, Object... params) throws IOException {
+ public void respond(Socket socket, Object value) throws IOException {

- String content = methodResponse(params);
+ String content = methodResponse(value);
String response = RESPONSE + (content.length()) + NEWLINES + content;
OutputStream outputStream = socket.getOutputStream();
outputStream.write(response.getBytes());
@@ -87,14 +87,13 @@
Log.d(Tag.LOG, "response:" + response);
}

- private String methodResponse(Object[] params)
- throws IllegalArgumentException, IllegalStateException, IOException {
+ private String methodResponse(Object value) throws
IllegalArgumentException, IllegalStateException, IOException {
StringWriter bodyWriter = new StringWriter();
serializer.setOutput(bodyWriter);
serializer.startDocument(null, null);
serializer.startTag(null, Tag.METHOD_RESPONSE);

- serializeParams(params);
+ serializeParams(value);

serializer.endTag(null, Tag.METHOD_RESPONSE);
serializer.endDocument();