summaryrefslogtreecommitdiff
path: root/same/src/main
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-12 20:51:12 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-12 20:51:12 +0100
commit68145bc0805364fe3e01e4388de5bb70baa56fe0 (patch)
tree2333cfa0c0b26b25124cad5c22bda144261cbf32 /same/src/main
parent0c1fe5d3169b069bc88c1de7375658c1c885487c (diff)
Add failing functional test.
Test fails because of the new ConnectionState that is not properly implemented.
Diffstat (limited to 'same/src/main')
-rw-r--r--same/src/main/java/com/orbekk/same/Client.java6
-rw-r--r--same/src/main/java/com/orbekk/same/Master.java2
2 files changed, 6 insertions, 2 deletions
diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index 35e3f0e..2bfee27 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -19,7 +19,7 @@ public class Client implements DiscoveryListener {
/** TODO: Not really useful yet. Remove? */
private ConnectionState connectionState = ConnectionState.DISCONNECTED;
private ConnectionManager connections;
- private State state;
+ State state;
private String myUrl;
private String masterUrl;
private int masterId = -1;
@@ -148,6 +148,10 @@ public class Client implements DiscoveryListener {
discoveryThread.interrupt();
}
+ void performWork() {
+ discoveryThread.performWork();
+ }
+
public String getUrl() {
return myUrl;
}
diff --git a/same/src/main/java/com/orbekk/same/Master.java b/same/src/main/java/com/orbekk/same/Master.java
index b491313..ba87c12 100644
--- a/same/src/main/java/com/orbekk/same/Master.java
+++ b/same/src/main/java/com/orbekk/same/Master.java
@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
public class Master {
private Logger logger = LoggerFactory.getLogger(getClass());
private final ConnectionManager connections;
- private State state;
+ State state;
private Broadcaster broadcaster;
public static Master create(ConnectionManager connections,