From 1517ec87df466d9c2b0c38ff80b7160bb67c2ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Fri, 17 Feb 2012 10:16:17 +0100 Subject: Change ClientInterface.set(). Take revision parameter. --- same/src/main/java/com/orbekk/same/http/StateServlet.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'same/src/main/java/com/orbekk/same/http') diff --git a/same/src/main/java/com/orbekk/same/http/StateServlet.java b/same/src/main/java/com/orbekk/same/http/StateServlet.java index fdb2eb9..31e8bcb 100644 --- a/same/src/main/java/com/orbekk/same/http/StateServlet.java +++ b/same/src/main/java/com/orbekk/same/http/StateServlet.java @@ -33,10 +33,12 @@ public class StateServlet extends HttpServlet { } try { - client.set(request.getParameter("key"), request.getParameter("value")); + String key = request.getParameter("key"); + String value = request.getParameter("value"); + long revision = client.getState().getRevision(key); + client.set(key, value, revision); response.getWriter().println("Updated component: " + - request.getParameter("key") + "=" + - request.getParameter("value")); + key + "=" + value); } catch (UpdateConflict e) { response.getWriter().println("Update conflict: " + throwableToString(e)); -- cgit v1.2.3