Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-10-02 10:32:39 +0000
committerEike Stepper2012-10-02 10:32:39 +0000
commitca64dc3561828da7b5c6d6c733cd4897df6681af (patch)
tree442d6eac6310bbaa32be41e3fc32216484723dff
parent784c02509d20fba8773aa93c05b152736b475e94 (diff)
downloadcdo-ca64dc3561828da7b5c6d6c733cd4897df6681af.tar.gz
cdo-ca64dc3561828da7b5c6d6c733cd4897df6681af.tar.xz
cdo-ca64dc3561828da7b5c6d6c733cd4897df6681af.zip
[390908] NPE when requesting an EObject from a different view thatdrops/S20121002-0801
is TRANSIENT https://bugs.eclipse.org/bugs/show_bug.cgi?id=390908
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 72ba4f18f6..0e906796b8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -883,6 +883,11 @@ public abstract class AbstractCDOView extends Lifecycle implements InternalCDOVi
checkActive();
CDOObject object = CDOUtil.getCDOObject(objectFromDifferentView);
CDOView view = object.cdoView();
+ if (view == null)
+ {
+ return null;
+ }
+
if (view != this)
{
if (!view.getSession().getRepositoryInfo().getUUID().equals(getSession().getRepositoryInfo().getUUID()))

Back to the top