From 07c8a1d8c78a3f2fab8bbfb221f0b518cc0d8616 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 14 Nov 2012 20:44:59 -0300 Subject: [PATCH] Update session for the same user. --- .../src/main/java/com/wisemapping/service/LockManager.java | 2 ++ .../main/java/com/wisemapping/service/LockManagerImpl.java | 5 +++++ .../main/java/com/wisemapping/webmvc/MindmapController.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java index ecfae08c..daed4a95 100644 --- a/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java @@ -41,4 +41,6 @@ public interface LockManager { @NotNull LockInfo lock(@NotNull Mindmap mindmap, @NotNull User user) throws WiseMappingException; + + long generateSession(); } diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java index 0ba39239..ca8da61e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java @@ -114,6 +114,11 @@ class LockManagerImpl implements LockManager { return this.lock(mindmap, user, System.nanoTime()); } + @Override + public long generateSession() { + return System.nanoTime(); + } + @Override @NotNull public LockInfo lock(@NotNull Mindmap mindmap, @NotNull User user, long session) throws WiseMappingException { diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java index e38343de..da7014e4 100644 --- a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java @@ -163,7 +163,7 @@ public class MindmapController { } else { final LockInfo lock = lockManager.lock(mindmap, collaborator); model.addAttribute("lockTimestamp", lock.getTimestamp()); - model.addAttribute(LOCK_SESSION_ATTRIBUTE, lock.getSession()); + model.addAttribute(LOCK_SESSION_ATTRIBUTE, lockManager.generateSession()); } model.addAttribute("lockInfo", lockManager.getLockInfo(mindmap)); }