summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same/Client.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-28 11:57:48 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-28 11:57:48 +0100
commit6a030381607aaf7b44529c4d5a6552749305c3d2 (patch)
tree366ac55e7a96af649d1640dd80607fee0a40bf1f /same/src/main/java/com/orbekk/same/Client.java
parentbc2d8fa1da02037d0b9a2361f394f19e494c8cec (diff)
Run SameService in a separate process.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/Client.java')
-rw-r--r--same/src/main/java/com/orbekk/same/Client.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index b18f523..d035881 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -44,7 +44,9 @@ public class Client implements DiscoveryListener {
boolean success = master.updateStateRequest(
component.getName(), component.getData(),
component.getRevision());
- if (!success) {
+ if (success) {
+ op.complete(DelayedOperation.Status.createOk());
+ } else {
op.complete(DelayedOperation.Status
.createConflict("Conflict from master"));
}