Hack collection.

– MyJsonRpcHttpClient: A JsonRpcHttpClient that uses Apache
  HttpComponents because of a HttpURLConnection bug in Android 2.2.
  Receives hack status because of nasty overloading.

– Log4j-android doesn't like printing stack traces – convert them to
  string before logging.

2 files changed, 17 insertions, 3 deletions

diff --git a/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
index d477834..92b7588 100644
--- a/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
+++ b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
@@ -2,6 +2,7 @@ package com.orbekk.same;
 
 import com.googlecode.jsonrpc4j.JsonRpcHttpClient;
 import com.googlecode.jsonrpc4j.ProxyUtil;
+import com.orbekk.net.MyJsonRpcHttpClient;
 import com.orbekk.paxos.PaxosService;
 
 import java.net.MalformedURLException;
@@ -32,9 +33,8 @@ public class ConnectionManagerImpl implements ConnectionManager {
     private <T>T getClassProxy(String url, Class<T> clazz) {
         T service = null;
         try {
-            JsonRpcHttpClient client = new JsonRpcHttpClient(new URL(url));
-            client.setConnectionTimeoutMillis(connectionTimeout);
-            client.setReadTimeoutMillis(readTimeout);
+            MyJsonRpcHttpClient client = new MyJsonRpcHttpClient(new URL(url),
+                    connectionTimeout, readTimeout);
             service = ProxyUtil.createProxy(
                     this.getClass().getClassLoader(),
                     clazz,
diff --git a/same/src/main/java/com/orbekk/same/StackTraceUtil.java b/same/src/main/java/com/orbekk/same/StackTraceUtil.java
new file mode 100644
index 0000000..0c0c3d0
--- /dev/null
+++ b/same/src/main/java/com/orbekk/same/StackTraceUtil.java
@@ -0,0 +1,14 @@
+package com.orbekk.same;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+
+public class StackTraceUtil {
+    public static String throwableToString(Throwable t) {
+        Writer writer = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(writer);
+        t.printStackTrace(printWriter);
+        return writer.toString();
+    }
+}