From 4afcf74e457f1609ce68e24e22c24091d1ee4b14 Mon Sep 17 00:00:00 2001
From: Laurent Goubet
Date: Wed, 6 Jul 2016 17:19:50 +0200
Subject: [497399] tagged values tooltips throw IAEs

Bug: 497399
Change-Id: I410f03e181f168f710dd36f2b3354104f668c53d
---
 .../src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java
index 04c11d698..ce0240153 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.compare.ResourceLocationChange;
 import org.eclipse.emf.compare.internal.merge.MergeMode;
 import org.eclipse.emf.compare.provider.ISemanticObjectLabelProvider;
 import org.eclipse.emf.compare.utils.MatchUtil;
+import org.eclipse.emf.compare.utils.ReferenceUtil;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -190,7 +191,7 @@ public abstract class AbstractTooltipProvider<T extends Diff> extends AdapterImp
 	private String getPreviousValue(EStructuralFeature eStructuralFeature, EObject eObject) {
 		Object ancestor = null;
 		if (eObject != null) {
-			ancestor = eObject.eGet(eStructuralFeature);
+			ancestor = ReferenceUtil.safeEGet(eObject, eStructuralFeature);
 		}
 		String value = ""; //$NON-NLS-1$
 		if (ancestor instanceof EObject) {
-- 
cgit v1.2.3