zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more lock issues.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-13 21:01:04 -03:00
parent 71762ff629
commit b1172f16cc
6 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java
View File

@@ -46,6 +46,7 @@ import java.util.Locale;
public class MindmapController {
public static final String LOCK_SESSION_ATTRIBUTE = "lockSession";
@Qualifier("mindmapService")
@Autowired
private MindmapService mindmapService;
@@ -160,10 +161,9 @@ public class MindmapController {
readOnlyMode = true;
model.addAttribute("mindmapLocked",true);
} else {
final long session = lockManager.generateSession();
final LockInfo lock = lockManager.lock(mindmap, collaborator, session);
final LockInfo lock = lockManager.lock(mindmap, collaborator);
model.addAttribute("lockTimestamp", lock.getTimestamp());
model.addAttribute("lockSession", session);
model.addAttribute(LOCK_SESSION_ATTRIBUTE, lock.getSession());
}
model.addAttribute("lockInfo", lockManager.getLockInfo(mindmap));
}