Some of the fix for Bugzilla Bug 57432

   NPE when creating declare messages 
[If we don't know the originating source file, have a better guess than 'Unknown']

1 files changed, 9 insertions, 3 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java b/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java
index f8c4c3c9a..8f7f4065a 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java
@@ -31,9 +31,15 @@ public class BcelSourceContext implements ISourceContext {
 		this.inObject = inObject;
 		sourceFileName = inObject.getJavaClass().getSourceFileName();
 		
-		String pname = inObject.getResolvedTypeX().getPackageName();
-		if (pname != null) {
-			sourceFileName = pname.replace('.', '/') + '/' + sourceFileName;
+		
+		// <Unknown> is the default when we don't know where it came from (see JavaClass.source_file_name)
+		if (sourceFileName!=null && sourceFileName.equals("<Unknown>")) { 
+			sourceFileName = "Type '"+ inObject.getResolvedTypeX().getName()+"' (no debug info available)";
+		} else {
+			String pname = inObject.getResolvedTypeX().getPackageName();
+			if (pname != null) {
+				sourceFileName = pname.replace('.', '/') + '/' + sourceFileName;
+			}
 		}
 	}