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

Keep fixing user issues.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-14 20:33:42 -03:00
parent 16e59a0879
commit 596aeeebc4
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
View File

@@ -183,12 +183,13 @@ public class MindmapController extends BaseController {
}
final LockInfo lockInfo = lockManager.getLockInfo(mindmap);
if (lockInfo.getUser().equalCollab(user)) {
if (lockInfo.getUser().identityEquality(user)) {
final boolean outdated = mindmap.getLastModificationTime().getTimeInMillis() > timestamp;
if (lockInfo.getSession() == session) {
// Timestamp might not be returned to the client. This try to cover this case, ignoring the client timestamp check.
final User lastEditor = mindmap.getLastEditor();
if (outdated && (lockInfo.getPreviousTimestamp() != timestamp || lastEditor == null || !lastEditor.equals(user))) {
// lockInfo.getPreviousTimestamp() == timestamp : In case the timestap is not returned. Give a second chance.
if (outdated && (lockInfo.getPreviousTimestamp() != timestamp || lastEditor == null || !lastEditor.identityEquality(user))) {
throw new SessionExpiredException(lastEditor);
}
} else if (outdated) {

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
View File

@@ -124,7 +124,7 @@ public class RestUser {
}
RestUser restUser = (RestUser) o;
return this.getDelegated().equalCollab(restUser.getDelegated());
return this.getDelegated().identityEquality(restUser.getDelegated());
}
@Override