diff options
author | Caspar De Groot | 2011-09-01 07:52:03 +0000 |
---|---|---|
committer | Caspar De Groot | 2011-09-01 07:52:03 +0000 |
commit | d91b8908f8f2cfb84cb9ac258cf57c440970e739 (patch) | |
tree | 7e28c7ac6bbc9e69a2eeb75169783fe43d45d20d /plugins/org.eclipse.emf.cdo.server.db4o | |
parent | 06652cd713e41e414f12e8254b9a3716d825371b (diff) | |
download | cdo-d91b8908f8f2cfb84cb9ac258cf57c440970e739.tar.gz cdo-d91b8908f8f2cfb84cb9ac258cf57c440970e739.tar.xz cdo-d91b8908f8f2cfb84cb9ac258cf57c440970e739.zip |
[351912] Lock coordination with SynchronizableRepositories
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351912
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db4o')
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java index 2efdf7e275..64b03cbd22 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java +++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java @@ -12,11 +12,11 @@ package org.eclipse.emf.cdo.server.internal.db4o; import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.lock.CDOLockUtil; import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockArea; import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockArea.Handler; import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockAreaNotFoundException; import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockGrade; -import org.eclipse.emf.cdo.spi.server.DurableLockArea; import org.eclipse.emf.cdo.spi.server.InternalLockManager; import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType; @@ -42,7 +42,7 @@ public class DB4ODurableLockingManager extends Lifecycle boolean readOnly, Map<CDOID, LockGrade> locks) { String durableLockingID = getNextDurableLockingID(accessor); - LockArea lockArea = new DurableLockArea(durableLockingID, userID, branchPoint, readOnly, locks); + LockArea lockArea = CDOLockUtil.createLockArea(durableLockingID, userID, branchPoint, readOnly, locks); storeLockArea(accessor, lockArea); return lockArea; } @@ -183,7 +183,7 @@ public class DB4ODurableLockingManager extends Lifecycle { for (;;) { - String durableLockingID = DurableLockArea.createDurableLockingID(); + String durableLockingID = CDOLockUtil.createDurableLockingID(); try { diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java index 35d248e751..92e5d02e13 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java +++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java @@ -15,10 +15,10 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchManager; import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.lock.CDOLockUtil; import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockArea; import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockGrade; import org.eclipse.emf.cdo.server.db4o.IDB4OStore; -import org.eclipse.emf.cdo.spi.server.DurableLockArea; import java.util.HashMap; import java.util.LinkedList; @@ -82,7 +82,8 @@ public class DB4OLockArea lockMap.put(cdoid, lockGrade); } - LockArea lockArea = new DurableLockArea(primitive.id, primitive.userID, branchpoint, primitive.readOnly, lockMap); + LockArea lockArea = CDOLockUtil.createLockArea(primitive.id, primitive.userID, branchpoint, primitive.readOnly, + lockMap); map.put(lockArea, primitive); return lockArea; } |