From ef7885fd1269261aec9cb1265f0e15472fdb03bb Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 3 Aug 2004 14:53:38 +0000
Subject: Some more fix for Bugzilla Bug 60015 	  	NPE, Incorrect
 XLint:unmatchedSuperTypeInCall warning

---
 weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'weaver')

diff --git a/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java b/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java
index 6154f07d8..4dda76c47 100644
--- a/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java
@@ -114,6 +114,11 @@ public class KindedPointcut extends Pointcut {
 				exactDeclaringType.resolve(world))) {
 			return;
 		}
+		
+		// PR60015 - Don't report the warning if the declaring type is object and 'this' is an interface
+		if (exactDeclaringType.isInterface(world) && shadowDeclaringType.equals(world.resolve("java.lang.Object"))) {
+			return;
+		}
 
 		SignaturePattern nonConfusingPattern =
 			new SignaturePattern(
-- 
cgit v1.2.3