Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2022-07-01 09:21:48 +0000
committerEike Stepper2022-07-01 09:21:48 +0000
commit2b5a7e77e3373c370a4647ac7b3f22a9f9f7e5e3 (patch)
treec4105cb6f109f498fd95ac142f6c69a795b7eb5c
parent3ae4d9925b1cfeb0a07645198e4b94b8bda125ec (diff)
downloadcdo-master.tar.gz
cdo-master.tar.xz
cdo-master.zip
[580269] Prevent addition of new Adapters while a CDOView is closing and clearing adaptersHEADmaster
https://bugs.eclipse.org/bugs/show_bug.cgi?id=580269
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java1
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index be6da13cea..cc57da0da4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -1681,7 +1681,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
{
return;
}
-
+
InternalCDOView view = viewAndState.view;
if (view != null)
{
@@ -1694,7 +1694,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
return;
}
}
-
+
throw ex;
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index f4ee499296..929b9d1fde 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -1695,7 +1695,6 @@ public class CDOViewImpl extends AbstractCDOView
lockOwner = null;
changeSubscriptionManager = null;
- closing = false;
super.doDeactivate();
}

Back to the top