fix for Bugzilla Bug 45441

   IncompatibleClassChangeError at runtime when compiling with -1.4 option

1 files changed, 8 insertions, 0 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java
index 2ec487518..8e5ef3837 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java
@@ -161,6 +161,14 @@ public class ThisJoinPointVisitor extends AbstractSyntaxTreeVisitorAdapter {
 		//System.err.println("replace static ref: " + receiver + " is " + System.identityHashCode(receiver));
 		receiver.binding = thisJoinPointStaticPartDecLocal; //thisJoinPointStaticPartDec;
 		receiver.codegenBinding = thisJoinPointStaticPartDecLocal;
+		
+		ReferenceBinding thisJoinPointStaticPartType = 
+			(ReferenceBinding)thisJoinPointStaticPartDec.type;
+			
+		receiver.receiverType = receiver.actualReceiverType =
+			receiver.resolvedType = thisJoinPointStaticPartType;
+			
+		call.setActualReceiverType(thisJoinPointStaticPartType);
 
 		call.binding = call.codegenBinding = getEquivalentStaticBinding(call.binding);
 	}