Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2022-11-04 19:03:53 +0000
committerEike Stepper2022-11-04 19:04:11 +0000
commit93d23c0bb3aee94a5ea00185f8d6cc28f05cc8e6 (patch)
tree88c565a292fa93ab022dd3f8441a5c36da803cbc /plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf
parent24591b34eabe627a44588f14b564f99faf18b623 (diff)
downloadcdo-93d23c0bb3aee94a5ea00185f8d6cc28f05cc8e6.tar.gz
cdo-93d23c0bb3aee94a5ea00185f8d6cc28f05cc8e6.tar.xz
cdo-93d23c0bb3aee94a5ea00185f8d6cc28f05cc8e6.zip
[580991] Outdated lock state when releasing a durable lock
https://bugs.eclipse.org/bugs/show_bug.cgi?id=580991
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf')
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java3
3 files changed, 10 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java
index b544144297..0460c1b270 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java
@@ -10,9 +10,12 @@
*/
package org.eclipse.emf.cdo.common.lock;
+import org.eclipse.net4j.util.ref.Interner;
+
/**
* A client-side representation of a view owning locks.
* <p>
+ * Implementation note: All lock owners are {@link Interner interned}. That means they can safely be compared via "==".
*
* @author Caspar De Groot
* @since 4.1
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
index a90768ca9a..77c8c238f7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
@@ -346,6 +346,11 @@ public interface CDOProtocolConstants
/**
* @since 4.20
*/
+ public static final short SIGNAL_LOCK_OWNER_REMAPPED_NOTIFICATION = 70;
+
+ /**
+ * @since 4.20
+ */
public static final short SIGNAL_USER_OFFSET = 1000;
// //////////////////////////////////////////////////////////////////////
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
index 06f11b4ad0..e5b784fb89 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
@@ -19,8 +19,9 @@ class CDOProtocolVersion
static
{
- VALUE = 47; // Bug 580439 - Truncated CDOLobs in repository
+ VALUE = 48; // SIGNAL_LOCK_OWNER_REMAPPED_NOTIFICATION
+ // VALUE = 47; // Bug 580439 - Truncated CDOLobs in repository
// VALUE = 46; // SIGNAL_REMOTE_TOPIC
// VALUE = 45; // SIGNAL_AUTHORIZE_OPERATIONS
// VALUE = 44; // SIGNAL_VIEW_CLOSED_NOTIFICATION

Back to the top