From d53adfdb2eb42f3b119c7cc8c542ac18e171bd10 Mon Sep 17 00:00:00 2001 From: Mathieu Cartaud Date: Tue, 4 Oct 2016 17:10:14 +0200 Subject: [502834] Fix NPE in OpaqueElementBodyChangeAccessor Bug: 502834 Change-Id: Idc0913e0c4caec4856d91adf4322b2242bf3f6de Signed-off-by: Mathieu Cartaud --- .../rcp/ui/internal/accessor/OpaqueElementBodyChangeAccessor.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/OpaqueElementBodyChangeAccessor.java b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/OpaqueElementBodyChangeAccessor.java index e22c79402..36e38bef9 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/OpaqueElementBodyChangeAccessor.java +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/OpaqueElementBodyChangeAccessor.java @@ -14,6 +14,7 @@ import com.google.common.base.Optional; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.CoreException; @@ -111,6 +112,9 @@ public class OpaqueElementBodyChangeAccessor extends AbstractTypedElementAdapter */ @SuppressWarnings("unchecked") private List getLanguageValues() { + if (eObject == null) { + return Collections.emptyList(); + } return (List)ReferenceUtil.safeEGet(eObject, getLanguageFeature()); } @@ -121,6 +125,9 @@ public class OpaqueElementBodyChangeAccessor extends AbstractTypedElementAdapter */ @SuppressWarnings("unchecked") private List getBodyValues() { + if (eObject == null) { + return Collections.emptyList(); + } return (List)ReferenceUtil.safeEGet(eObject, getBodyFeature()); } -- cgit v1.2.3