summaryrefslogtreecommitdiff
path: root/same/src/main/java/com
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-27 11:12:08 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-27 11:12:08 +0200
commitccc1c8c56acb4347403cdd43a394e492964c83cc (patch)
treedaf3260855df77ccf9380f7d26dd095e2935a262 /same/src/main/java/com
parent841db9546efdf08a3b6a91a92936ad90b277f39c (diff)
Bugfixes on same-android.
Diffstat (limited to 'same/src/main/java/com')
-rw-r--r--same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java2
-rw-r--r--same/src/main/java/com/orbekk/same/Client.java1
-rw-r--r--same/src/main/java/com/orbekk/same/Types.java3
3 files changed, 2 insertions, 4 deletions
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>() {};
- }
}