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

Fix collaboration equal issue.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-14 20:17:55 -03:00
parent 2861a7b5f9
commit 16e59a0879
7 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ public class MindmapController extends BaseController {
}
final LockInfo lockInfo = lockManager.getLockInfo(mindmap);
if (lockInfo.getUser().equals(user)) {
if (lockInfo.getUser().equalCollab(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.

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

@@ -23,7 +23,6 @@ import com.wisemapping.model.User;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.jetbrains.annotations.NotNull;
import javax.xml.bind.annotation.XmlAccessType;
@@ -125,7 +124,7 @@ public class RestUser {
}
RestUser restUser = (RestUser) o;
return this.getDelegated().equals(restUser.getDelegated());
return this.getDelegated().equalCollab(restUser.getDelegated());
}
@Override