Bug 507254 - Run tests with assertions enabled

- fix AssertionError in CalloutImplementor.createCallout

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);