Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2016-09-16 11:32:47 -0400
committerEike Stepper2016-09-24 04:37:12 -0400
commitb8be6e007b76707e409c3693d43585b6a41effa5 (patch)
tree1a7c3a4ebaf163490bfe3ca05dcd989de5f0692b /plugins/org.eclipse.emf.cdo.server.security
parent24e214f39f88ef039701b06c85828ba75f4ff3d5 (diff)
downloadcdo-b8be6e007b76707e409c3693d43585b6a41effa5.tar.gz
cdo-b8be6e007b76707e409c3693d43585b6a41effa5.tar.xz
cdo-b8be6e007b76707e409c3693d43585b6a41effa5.zip
[501607] Fix circularly error when Realm is modified first.
If Realm is modified first and then other objects are modified, the commit was not possible. https://bugs.eclipse.org/bugs/show_bug.cgi?id=501607 Change-Id: I9854acf079b05a10e3ef4b5b860199b8715d8bae Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.security')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java3
2 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
index b4daf94f68..c556526e22 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.security;singleton:=true
Bundle-Name: %pluginName
-Bundle-Version: 4.3.200.qualifier
+Bundle-Version: 4.3.300.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,15 +12,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.security;bundle-version="[4.1.0,5.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.internal.security;version="4.3.200";
+Export-Package: org.eclipse.emf.cdo.server.internal.security;version="4.3.300";
x-friends:="org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.tests.db,
org.eclipse.emf.cdo.tests.db4o,
org.eclipse.emf.cdo.tests.hibernate,
org.eclipse.emf.cdo.tests.mongodb,
org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.security.bundle;version="4.3.200";x-internal:=true,
- org.eclipse.emf.cdo.server.security;version="4.3.200",
- org.eclipse.emf.cdo.server.spi.security;version="4.3.200"
+ org.eclipse.emf.cdo.server.internal.security.bundle;version="4.3.300";x-internal:=true,
+ org.eclipse.emf.cdo.server.security;version="4.3.300",
+ org.eclipse.emf.cdo.server.spi.security;version="4.3.300"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.cdo.server.internal.security.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
index c04af800ae..380987f1a0 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
@@ -10,6 +10,7 @@
* Christian W. Damus (CEA LIST) - bug 399306
* Christian W. Damus (CEA LIST) - bug 418454
* Christian W. Damus (CEA LIST) - bug 399487
+ * Laurent Redor (Obeo) - bug 501607
*/
package org.eclipse.emf.cdo.server.internal.security;
@@ -1211,7 +1212,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
if (object.eClass().getEPackage() == SecurityPackage.eINSTANCE)
{
validate(object, diagnostic, context);
- realmChecked = object instanceof Realm;
+ realmChecked |= object instanceof Realm;
}
}

Back to the top