Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2017-01-02 05:22:11 -0500
committerStephan Herrmann2017-01-15 13:20:03 -0500
commit9c554e6066aaf26ee11a418ae45b2b1e348e9346 (patch)
treed23064bca5bd39a3533ee31afae5f82f62ade272
parent8e06a977f560853b71a13669d225753362af0aaf (diff)
downloadorg.eclipse.objectteams-9c554e6066aaf26ee11a418ae45b2b1e348e9346.tar.gz
org.eclipse.objectteams-9c554e6066aaf26ee11a418ae45b2b1e348e9346.tar.xz
org.eclipse.objectteams-9c554e6066aaf26ee11a418ae45b2b1e348e9346.zip
Bug 507254 - Run tests with assertions enabled
- fix AssertionError in CalloutImplementor.createCallout
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CalloutImplementor.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingResolver.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CalloutImplementor.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CalloutImplementor.java
index f6021423b..6fb31def5 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CalloutImplementor.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CalloutImplementor.java
@@ -179,7 +179,7 @@ public class CalloutImplementor extends MethodMappingImplementor
// This binding is part of the interface part of a role:
MethodBinding roleMethodBinding = calloutMappingDeclaration.getRoleMethod();
- if(roleMethodBinding == null) // CLOVER: never true in jacks suite
+ if(roleMethodBinding == null)
{
// problemreporting already done in find-Base/Role-MethodBinding
assert(calloutMappingDeclaration.ignoreFurtherInvestigation);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingResolver.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingResolver.java
index c7ead5660..2543d63a2 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingResolver.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingResolver.java
@@ -107,7 +107,7 @@ public class MethodMappingResolver
if(methodMapping.isCallout())
{
if (this._role._playedByEnclosing) {
- this._roleScope.problemReporter().calloutToEnclosing((CalloutMappingDeclaration)methodMapping, this._role);
+ methodMapping.scope.problemReporter().calloutToEnclosing((CalloutMappingDeclaration)methodMapping, this._role);
result = false;
} else {
result &= resolveCalloutMapping((CalloutMappingDeclaration) methodMapping);

Back to the top