summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same/Master.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-11 15:46:27 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-11 15:46:27 +0200
commit04d448aade12127b1d8c9d4f26963833102698f8 (patch)
treeb4120784e328197aa5d724f6e6ca0d4d3b676c7d /same/src/main/java/com/orbekk/same/Master.java
parenta21280cc77c163ec7bd7bc1fc4b451a1fc01a1d8 (diff)
Change Client.joinNetwork.
Take MasterState instead of a simple URL.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/Master.java')
-rw-r--r--same/src/main/java/com/orbekk/same/Master.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/same/src/main/java/com/orbekk/same/Master.java b/same/src/main/java/com/orbekk/same/Master.java
index 1b2fbee..55d7daf 100644
--- a/same/src/main/java/com/orbekk/same/Master.java
+++ b/same/src/main/java/com/orbekk/same/Master.java
@@ -53,6 +53,15 @@ public class Master {
return myUrl;
}
+ public Services.MasterState getMasterInfo() {
+ return Services.MasterState.newBuilder()
+ .setMasterUrl(getUrl())
+ .setMasterLocation(getLocation())
+ .setNetworkName(getNetworkName())
+ .setMasterId(masterId)
+ .build();
+ }
+
private Services.Master newMasterImpl = new Services.Master() {
@Override public void joinNetworkRequest(RpcController controller,
ClientState request, RpcCallback<Empty> done) {