[445198] - Inconsistent/Erroneous filter causes an

IllegalArgumentException

2 files changed, 4 insertions, 5 deletions

diff --git a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtOperationalEvaluationEnv.java b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtOperationalEvaluationEnv.java
index 80670d575..145ff846e 100644
--- a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtOperationalEvaluationEnv.java
+++ b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtOperationalEvaluationEnv.java
@@ -435,11 +435,11 @@ public class QvtOperationalEvaluationEnv extends EcoreEvaluationEnvironment {
 			
 		}
 		else if(object instanceof DynamicEObjectImpl) {
-			for (EClass objParent : ((DynamicEObjectImpl) object).eClass().getEAllSuperTypes()) {
-				if (objParent.getClassifierID() == classifier.getClassifierID())
+			for (EClass objType : ((EObject) object).eClass().getEAllSuperTypes()) {
+				if (objType.getEPackage() == classifier.getEPackage() 
+						&& objType.getClassifierID() == classifier.getClassifierID())
 					return true;
 			}
-				
 		}
 		
 		if (classifier instanceof CollectionType<?, ?> && object instanceof java.util.Collection<?>) {
diff --git a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java
index fb111d265..846b9b695 100644
--- a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java
+++ b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java
@@ -4064,8 +4064,7 @@ public class QvtOperationalVisitorCS
 		}
 
 		boolean isEntryPoint = QvtOperationalEnv.MAIN.equals(mappingDeclarationCS.getSimpleNameCS().getValue());
-		boolean isMapping = ExpressionsPackage.eINSTANCE.getMappingOperation().getClassifierID() == 
-							operation.eClass().getClassifierID();
+		boolean isMapping = operation instanceof MappingOperation;
 		boolean createMappingParams = isEntryPoint || isMapping;
 		
 		List<EParameter> params = operation.getEParameters();