Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordwagelaar2015-10-25 09:38:37 -0400
committerdwagelaar2015-10-25 09:38:37 -0400
commit81c1a6a1bffb695eda268338daa76c15e1307f96 (patch)
tree383e1b9d6a1f88b23c7a9bcbf4ad1ce22efccad9 /plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse
parent8aa763ba9e44feeda86183ad3766d99f65d1f296 (diff)
parentda3f913d7f3c726dab21dff345380455570dfa2b (diff)
downloadorg.eclipse.atl-81c1a6a1bffb695eda268338daa76c15e1307f96.tar.gz
org.eclipse.atl-81c1a6a1bffb695eda268338daa76c15e1307f96.tar.xz
org.eclipse.atl-81c1a6a1bffb695eda268338daa76c15e1307f96.zip
Merge branch 'master' of ssh://dwagelaar@git.eclipse.org/gitroot/mmt/org.eclipse.atl.git
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 ad0a142a..087bf8a4 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
@@ -498,7 +498,7 @@ public final class OCLOperations {
"Cannot find property %s::%s", ecls.getName(), propname));
}
((EObject)object).eSet(sf, value);
- return null;
+ return object;
}
throw new VMException(frame, String.format(
"Cannot set properties for regular objects: %s",
@@ -521,7 +521,7 @@ public final class OCLOperations {
"Cannot find property %s::%s", ecls.getName(), propname));
}
((EObject)object).eUnset(sf);
- return null;
+ return object;
}
throw new VMException(frame, String.format(
"Cannot unset properties for regular objects: %s",

Back to the top