Attachment 233656 Details for Bug 294127 – The code that prepares 'extent' is now not used in cases when 'extent' is not used (i.e.when isMapping is false)

[patch] The code that prepares 'extent' is now not used in cases when 'extent' is not used (i.e.when isMapping is false)

bug294127.patch (text/plain), 1.19 KB, created by Alex Paperno

on 2013-07-21 19:26:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Paperno

Created: 2013-07-21 19:26:29 EDT

Size: 1.19 KB

patch

obsolete

>diff --git a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/evaluator/QvtOperationalEvaluationVisitorImpl.java b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/evaluator/QvtOperationalEvaluationVisitorImpl.java
>index 7492fcb..f7d6be3 100644
>--- a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/evaluator/QvtOperationalEvaluationVisitorImpl.java
>+++ b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/evaluator/QvtOperationalEvaluationVisitorImpl.java
>@@ -1984,7 +1984,7 @@
> 		
>     	for (EStructuralFeature tupleProp : tupleType.oclProperties()) {
> 			Object propVal = evalEnv.getValueOf(tupleProp.getName());
>-			if(propVal == null) {
>+			if(propVal == null && isMapping) {
> 				ModelParameter extent = null;
> 				for (VarParameter resultParam : resultParams) {
> 					if(tupleProp.getName().equals(resultParam.getName())) {
>@@ -1994,9 +1994,7 @@
> 					}
> 				}
> 				
>-				if(isMapping) {
>-					propVal = createInstance(tupleProp.getEType(), extent);
>-				}
>+				propVal = createInstance(tupleProp.getEType(), extent);
> 			}
> 			values.put(tupleProp, propVal);
> 			evalEnv.replace(tupleProp.getName(), propVal, tupleProp.getEType());

Flags:

serg.boyko2011: iplog+

Actions: View | Diff

Attachments on bug 294127: 233656 | 233657