commit 5b08f92e96ac553a81778e800c82f641bb4dabfd
author Ed Merks <ed.merks@gmail.com> Wed Aug 27 15:23:07 2014 +0200
committer Ed Merks <ed.merks@gmail.com> Wed Aug 27 15:24:33 2014 +0200
tree 3601555fdc5f1d2e82f49aaa45a55bf431f5e9a8
parent d273ce0e21f06aa227f880a515ba96181709ed0a

[442703] Consider in isInvariant that the operation's type can be null.

plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java

diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java
index 9c93b1a..da5e0b9 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java
@@ -4472,7 +4472,8 @@
   {
     // Base this on the instance class names so it returns true for models using the development time version of Ecore.
     //
-    return eOperation.getEType().getInstanceClassName() == "boolean" &&
+    EClassifier eType = eOperation.getEType();
+    return eType != null && eType.getInstanceClassName() == "boolean" &&
       eOperation.getEParameters().size() == 2 &&
       eOperation.getEParameters().get(0).getEType().getInstanceClassName() == "org.eclipse.emf.common.util.DiagnosticChain" &&
       eOperation.getEParameters().get(1).getEType().getInstanceClassName() == "java.util.Map";