From ccc1c8c56acb4347403cdd43a394e492964c83cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 27 Mar 2012 11:12:08 +0200
Subject: Bugfixes on same-android.

---
 same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java | 2 +-
 same/src/main/java/com/orbekk/same/Client.java             | 1 +
 same/src/main/java/com/orbekk/same/Types.java              | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'same/src/main/java/com')

diff --git a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java b/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
index f83bb41..b610a2f 100644
--- a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
+++ b/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
@@ -54,7 +54,7 @@ public class MyJsonRpcHttpClient extends JsonRpcHttpClient {
                 try {
                     rpcClient.invoke(methodName, arguments, out);
                 } catch (Exception e) {
-                    throw new IOException(e);
+                    throw new IOException(e.fillInStackTrace());
                 }
             }
         });
diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index 6d3a7d5..b210b6b 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -127,6 +127,7 @@ public class Client {
                 		"{}:{}. Ignoring", new Object[]{masterUrl, masterId,
                                 state.getDataOf(".masterUrl"),
                                 Client.this.masterId}); 
+                return;
             }
             abortMasterElection();
             Client.this.masterUrl = masterUrl;
diff --git a/same/src/main/java/com/orbekk/same/Types.java b/same/src/main/java/com/orbekk/same/Types.java
index 3185acf..1764742 100644
--- a/same/src/main/java/com/orbekk/same/Types.java
+++ b/same/src/main/java/com/orbekk/same/Types.java
@@ -7,7 +7,4 @@ public class Types {
             new TypeReference<String>() {};
     public final static TypeReference<Integer> INTEGER =
             new TypeReference<Integer>() {};
-    public static <T> TypeReference<T> fromType(Class<T> clazz) {
-        return new TypeReference<T>() {};
-    }
 }
-- 
cgit v1.2.3