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

20
wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
View File

@@ -63,7 +63,7 @@ class LockManagerImpl implements LockManager {
}
@Override
public LockInfo updateExpirationTimeout(@NotNull Mindmap mindmap, @NotNull User user, long session) {
public LockInfo updateExpirationTimeout(@NotNull Mindmap mindmap, @NotNull User user) {
if (!this.isLocked(mindmap)) {
throw new IllegalStateException("Lock lost for map. No update possible.");
}
@@ -74,9 +74,8 @@ class LockManagerImpl implements LockManager {
}
result.updateTimeout();
result.setSession(session);
result.updateTimestamp(mindmap);
// logger.debug("Timeout updated for:" + mindmap.getId());
logger.debug("Timeout updated for:" + mindmap.getId());
return result;
}
@@ -108,6 +107,13 @@ class LockManagerImpl implements LockManager {
return result;
}
@Override
@NotNull
public LockInfo lock(@NotNull Mindmap mindmap, @NotNull User user) throws WiseMappingException {
return this.lock(mindmap, user, System.nanoTime());
}
@Override
@NotNull
public LockInfo lock(@NotNull Mindmap mindmap, @NotNull User user, long session) throws WiseMappingException {
@@ -123,7 +129,8 @@ class LockManagerImpl implements LockManager {
if (result != null) {
// Update timeout only...
logger.debug("Update timestamp:" + mindmap.getId());
updateExpirationTimeout(mindmap, user, session);
updateExpirationTimeout(mindmap, user);
result.setSession(session);
} else {
logger.debug("Lock map id:" + mindmap.getId());
result = new LockInfo(user, mindmap, session);
@@ -132,11 +139,6 @@ class LockManagerImpl implements LockManager {
return result;
}
@Override
public long generateSession() {
return System.nanoTime();
}
public LockManagerImpl() {
lockInfoByMapId = new ConcurrentHashMap<Integer, LockInfo>();
expirationTimer.schedule(new TimerTask() {