summaryrefslogtreecommitdiff
path: root/same/src/main
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-27 17:01:36 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-27 17:01:36 +0100
commitaea82c6c2086c587382aa85cd3b4a862a89f8b55 (patch)
tree231e6d231a7631689a99506d82759f12ac666d84 /same/src/main
parent3ac0aac2ef24b3f50184b50f3c248e82bb6d6e78 (diff)
Add Discovery handling in SameService.
Diffstat (limited to 'same/src/main')
-rw-r--r--same/src/main/java/com/orbekk/same/SameController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 0601547..38c4149 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -20,7 +20,7 @@ public class SameController implements UrlReceiver {
/**
* Timeout for remote operations in milliseconds.
*/
- private static final int timeout = 2000;
+ private static final int timeout = 10000;
public static SameController create(int port) {
ConnectionManagerImpl connections = new ConnectionManagerImpl(
@@ -39,7 +39,7 @@ public class SameController implements UrlReceiver {
Server server = new Server(port);
SameController controller = new SameController(port, server, master, client,
paxos);
- RpcHandler rpcHandler = new RpcHandler(controller);
+ RpcHandler rpcHandler = new RpcHandler(null);
rpcHandler.addRpcServer("/MasterService.json", jsonMaster);
rpcHandler.addRpcServer("/ClientService.json", jsonClient);