JavaInCloud
diff --git a/‎cometd-java/cometd-java-oort/src/main/java/org/cometd/oort/OortMasterLong.java‎
Lines changed: 6 additions & 3 deletions b/‎cometd-java/cometd-java-oort/src/main/java/org/cometd/oort/OortMasterLong.java‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎cometd-java/cometd-java-oort/src/main/java/org/cometd/oort/OortMasterService.java‎
Lines changed: 11 additions & 1 deletion b/‎cometd-java/cometd-java-oort/src/main/java/org/cometd/oort/OortMasterService.java‎
Lines changed: 11 additions & 1 deletion
@@ -105,17 +105,20 @@ public boolean getAndAdd(long delta, Callback callback)
     }
 
     @Override
-    protected Long onForward(Object actionData)
+    protected Result<Long> onForward(Request request)
     {
-        long delta = ((Number)actionData).longValue();
+        if (!isMaster())
+            return Result.ignore(0L);
+
+        long delta = ((Number)request.getData()).longValue();
         long oldValue = value.get();
         while (true)
         {
             if (value.compareAndSet(oldValue, oldValue + delta))
                 break;
             oldValue = value.get();
         }
-        return oldValue;
+        return Result.success(oldValue);
     }
 
     @Override
 
@@ -46,6 +46,7 @@
  */
 public abstract class OortMasterService<R, C> extends OortService<R, C>
 {
+    private final boolean master;
     private final OortObject<Boolean> nodes;
 
     /**
@@ -56,7 +57,16 @@ public abstract class OortMasterService<R, C> extends OortService<R, C>
     public OortMasterService(Oort oort, String name, boolean master)
     {
         super(oort, name);
-        nodes = new OortObject<Boolean>(oort, name, OortObjectFactories.forBoolean(master));
+        this.master = master;
+        this.nodes = new OortObject<Boolean>(oort, name, OortObjectFactories.forBoolean(master));
+    }
+
+    /**
+     * @return whether this node is the "master" node
+     */
+    public boolean isMaster()
+    {
+        return master;
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -105,17 +105,20 @@ public boolean getAndAdd(long delta, Callback callback)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`@Override`
`108`		`- protected Long onForward(Object actionData)`
	`108`	`+ protected Result<Long> onForward(Request request)`
`109`	`109`	`{`
`110`		`- long delta = ((Number)actionData).longValue();`
	`110`	`+ if (!isMaster())`
	`111`	`+ return Result.ignore(0L);`
	`112`	`+`
	`113`	`+ long delta = ((Number)request.getData()).longValue();`
`111`	`114`	`long oldValue = value.get();`
`112`	`115`	`while (true)`
`113`	`116`	`{`
`114`	`117`	`if (value.compareAndSet(oldValue, oldValue + delta))`
`115`	`118`	`break;`
`116`	`119`	`oldValue = value.get();`
`117`	`120`	`}`
`118`		`- return oldValue;`
	`121`	`+ return Result.success(oldValue);`
`119`	`122`	`}`
`120`	`123`
`121`	`124`	`@Override`