Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordwagelaar2013-12-30 08:59:29 -0500
committerdwagelaar2013-12-30 08:59:29 -0500
commit4bf63846b03e4fa38bc5f0eb1dc3ec15bdcaa660 (patch)
treebe5cc81b9d9425cb08ca80bd6aa4a09b2cf69ea0 /plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse
parent56a6f71d93be08b26232a114bb2858c018c53291 (diff)
downloadorg.eclipse.atl-4bf63846b03e4fa38bc5f0eb1dc3ec15bdcaa660.tar.gz
org.eclipse.atl-4bf63846b03e4fa38bc5f0eb1dc3ec15bdcaa660.tar.xz
org.eclipse.atl-4bf63846b03e4fa38bc5f0eb1dc3ec15bdcaa660.zip
424513: oclIsTypeOf() on non-EObject fails when EClassifier does not
have an instance class. https://bugs.eclipse.org/bugs/show_bug.cgi?id=424513
Diffstat (limited to 'plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse')
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java
index 2f38f82a..73e4aa55 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/OCLOperations.java
@@ -312,8 +312,8 @@ public final class OCLOperations {
public Object execute(final StackFrame frame) {
final Object o = frame.getLocal(0, 0);
final EClassifier type = (EClassifier)frame.getLocal(0, 1);
- if (type instanceof EClass && o instanceof EObject) {
- return ((EObject) o).eClass() == type;
+ if (type instanceof EClass) {
+ return o instanceof EObject && ((EObject) o).eClass() == type;
} else if (o != null) {
final Class<?> ic = ((EClassifier)type).getInstanceClass();
if (ic == null) {

Back to the top