From 573741c8081c6b6b45921cafaae39f37eede2302 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 28 Jul 2004 14:43:40 +0000
Subject: [PATCH] Fix for 64331 	  	java.lang.NullPointerException in
 WeaverMessageHandler class

---
 .../compiler/WeaverMessageHandler.java        |  20 ++++++++++++------
 tests/ajcTests.xml                            |   7 ++++++
 tests/bugs/abstractITDs/A.java                |   2 ++
 tests/bugs/abstractITDs/B.aj                  |   3 +++
 tests/bugs/abstractITDs/B.jar                 | Bin 0 -> 1396 bytes
 tests/bugs/abstractITDs/C.java                |   2 ++
 tests/bugs/abstractITDs/buildBJar.bat         |   1 +
 .../src/org/aspectj/weaver/ResolvedTypeX.java |   9 +++++++-
 8 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 tests/bugs/abstractITDs/A.java
 create mode 100644 tests/bugs/abstractITDs/B.aj
 create mode 100644 tests/bugs/abstractITDs/B.jar
 create mode 100644 tests/bugs/abstractITDs/C.java
 create mode 100644 tests/bugs/abstractITDs/buildBJar.bat

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
index 71017a6c3..a379fccb6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.aspectj.ajdt.internal.compiler;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.aspectj.ajdt.internal.compiler.lookup.EclipseSourceLocation;
@@ -164,12 +165,13 @@ public class WeaverMessageHandler implements IMessageHandler {
 	private IProblem[] buildSeeAlsoProblems(List sourceLocations,
 											CompilationResult problemSource,
 											boolean usedBinarySourceFileName) {
-		int probLength = sourceLocations.size();
-		if (usedBinarySourceFileName) probLength++;
-		IProblem[] ret = new IProblem[probLength];
+		List ret = new ArrayList();
+
 		for (int i = 0; i < sourceLocations.size(); i++) {
 			ISourceLocation loc = (ISourceLocation) sourceLocations.get(i);
-			ret[i] = new DefaultProblem(loc.getSourceFile().getPath().toCharArray(),
+			if (loc != null ) {
+			  	DefaultProblem dp = 
+			  		new DefaultProblem( loc.getSourceFile().getPath().toCharArray(),
 										"see also",
 										0,
 										new String[] {},
@@ -177,13 +179,19 @@ public class WeaverMessageHandler implements IMessageHandler {
 										getStartPos(loc,null),
 										getEndPos(loc,null),
 										loc.getLine());
+			  ret.add(dp);
+			} else {
+				throw new RuntimeException("Internal Compiler Error: Unexpected null source location passed as 'see also' location.");
+			}
 		}
 		if (usedBinarySourceFileName) {
-			ret[ret.length -1] = new DefaultProblem(problemSource.fileName,"see also",0,new String[] {},
+			DefaultProblem dp = new DefaultProblem(problemSource.fileName,"see also",0,new String[] {},
 													ProblemSeverities.Ignore,0,
 													0,0);
+			ret.add(dp);
 		}
-		return ret;
+		IProblem[] retValue = (IProblem[])ret.toArray(new IProblem[]{});
+		return retValue;
 	}
 }
 
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 85c36164b..f76405da3 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7795,4 +7795,11 @@
         </compile>
     </ajc-test>
     
+    <ajc-test dir="bugs/abstractITDs"
+		pr="64331" title="java.lang.NullPointerException in WeaverMessageHandler class">
+        <compile files="A.java,C.java" aspectpath="B.jar">
+          <message kind="error" line="1" text="must implement abstract inter-type declaration: void A.foo()"/>
+        </compile>
+    </ajc-test>
+    
 </suite>
diff --git a/tests/bugs/abstractITDs/A.java b/tests/bugs/abstractITDs/A.java
new file mode 100644
index 000000000..5d9e777af
--- /dev/null
+++ b/tests/bugs/abstractITDs/A.java
@@ -0,0 +1,2 @@
+public abstract class A {
+}
diff --git a/tests/bugs/abstractITDs/B.aj b/tests/bugs/abstractITDs/B.aj
new file mode 100644
index 000000000..54af3233e
--- /dev/null
+++ b/tests/bugs/abstractITDs/B.aj
@@ -0,0 +1,3 @@
+public aspect B {
+	abstract public void A.foo();
+}
\ No newline at end of file
diff --git a/tests/bugs/abstractITDs/B.jar b/tests/bugs/abstractITDs/B.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b0fcaad10b33b113e2a2ce658e5670a83d59682e
GIT binary patch
literal 1396
zcmWIWW@Zs#-~hs+sy_w{NI-;vg~8V~#8KDN&rRRg(a+P(H8@1i*X`da28PeRXHNTg
z>*`(P_14uocjo-&AcHH$51tn3dHL#i`d%zuwI!%PN6*7o?_*HGx%0Xw&UorRdiv-o
z6GMPEJIAIg;a!$Mi_C#I0H^irKv_q<<ebFfVqJenzrzLsbA0cxI4!)uu29IVWy!DM
z<TcU4wLn8FU46zQjUyVRr*~T@7CvCK;o4Xhanksn>}liQpMQVlbx87Bpu{TJC%rYe
za`mp#x_HxFWtvG&MX6Sg*KvOQd9+I*@6BYn<QA3Y19FK$v;6Mo#%tfTU$N?HOJ-*F
z)pa5HHUI5J-W|>PF?rJr;Y~~Le%rdwG|rRjWp8BlwrK@fzqf|WHvg9YWOtbL-P6Y%
zyqC`rOYgXGBb?=vr9|+%qO>Hr*t(?u$|u-+9w(ltIWgy>=b;uB{WInN-)THxQ9rX;
z!tQC39B(3{p$hkJ_WO|qkAE?P!sws>uB!LI5O8566h=;vFscoS_7`>(`Pa7Xi<791
zxZ_hb*Qf(wuXH!MTo&`_V3oU-VBmYEMDkYdtGvzDPd|0nJakkLRPNmO@j-vkd7p6B
z%R4-+pU<(p|MOf;dfEQ}KR$^%aGjTou;VypaN)sko4ZfKboYklayYX+OqO`WtDG0L
zEaq|A=C>V8`MaAEcl<El9aH{>IWD(L=kN-ze9q-5QCpWy*tRuq=cH&h$C{%ysx8xc
zmuY>U#MJr3ta*RJ`%CY9dAGzyUbr3TBG|cr-Fy+p0&|}*`@;$1mlX00zli&K=WM$l
z-WnX{*cNfotfF|f^|DWU6W(uH)|V6^`aQYjMe5xW$z@i@ryRN|uqp5Tx*2)h-i!B%
zoIhUt(e}1l!J-+bSM{amE}!-&uUjQ+2_MUSalfq6{Qj8Y_$g;*9aZIY-Sw<#hx>7r
z5)t99LYc`+9N2elJucv(vQ<MkR_mG6Qf2RJttP!1O&pq>k9dlw%=#8&?Ui%O^6j&?
z+qUkm%IKJ8lB?apu4sDo=aH$NQ<pdwpDddjTNHhAQcnWkXP$>v<<_ZR=iJLGGwl~#
z-|ulU&$=zbc<Q=;HC^Ts$9BssuDK#4ox561rfp;1@h=|BcD*Up;4<rd8c-JgvNz6a
zl6Pa~t26%7cd-kWrk{`sK6LSx_y5E$qc0P;duT5<{UvE`ukfYn9}ly-)uY8{BqE!o
z7At8L|KK-ztH}KM`HtE}E89XA`Uxza^+wCWNB7RcHM^hqt_)Y0&iZGr^}_e|S2i#3
z5?<iH{m<-2!pr<hCMx=}Xqol?PC1(~!OKr*WmTKM;qGG2|Hrw{ygeecT*Bh`q3!ht
zx+^MpZ5CEGoX`xK&hewa_V{%H!LM9#&OWa!Zi>ISY3crpr+;0!#DPiMj4FIy`<(yp
zzh<raD)Vobt3OP+!@Eao&x$pd$`?KD@=DVT7M%B%_y66-*(*IBdTkHNy?%#l{jN(7
z+hX+B?+`5&-CLIQ<@AG@Qfv5su!6Dz@4cFp*O-814htwNFfxfSAj&J`q6Ac4p#of`
v7rH6PnGICzAV58k2`z-sH6c3-RnuZ%o`vSh0B=?{kZH_7xB*D713M7_9P2Wn

literal 0
HcmV?d00001

diff --git a/tests/bugs/abstractITDs/C.java b/tests/bugs/abstractITDs/C.java
new file mode 100644
index 000000000..8e6613707
--- /dev/null
+++ b/tests/bugs/abstractITDs/C.java
@@ -0,0 +1,2 @@
+public class C extends A {
+}
\ No newline at end of file
diff --git a/tests/bugs/abstractITDs/buildBJar.bat b/tests/bugs/abstractITDs/buildBJar.bat
new file mode 100644
index 000000000..4905f255f
--- /dev/null
+++ b/tests/bugs/abstractITDs/buildBJar.bat
@@ -0,0 +1 @@
+ajc A.java B.aj -outjar B.jar
diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
index 16634af07..2779f7cdd 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
@@ -986,10 +986,17 @@ public abstract class ResolvedTypeX extends TypeX {
         for (Iterator iter = getInterTypeMungersIncludingSupers().iterator(); iter.hasNext();) {
 			ConcreteTypeMunger element = (ConcreteTypeMunger) iter.next();
             if (element.getSignature() != null && element.getSignature().isAbstract()) {
+            	ISourceLocation xtraLocation = element.getSourceLocation();
+            	if (xtraLocation == null) {
+            		// Until intertype mungers remember where they came from, the source location
+            		// for the element is null when binary weaving.  In these cases uses the
+            		// source location for the aspect containing the ITD
+     				xtraLocation = element.getAspectType().getSourceLocation();
+            	}
                 world.getMessageHandler().handleMessage(
                     new Message("must implement abstract inter-type declaration: " + element.getSignature(),
                         "", IMessage.ERROR, getSourceLocation(), null, 
-                        new ISourceLocation[] { element.getSourceLocation() }));
+                        new ISourceLocation[] { xtraLocation }));
             }
 		}
     }
-- 
2.39.5