fix for NPE EclipseAdaptorUtils.java:147

as reported by Wes.

2 files changed, 8 insertions, 1 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 0b93dc564..608aea62d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -648,7 +648,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
 							}
 						} catch (IOException ex) {
 							IMessage message = EclipseAdapterUtils.makeErrorMessage(
-									unitResult.compilationUnit,
+									new String(unitResult.fileName),
 									CANT_WRITE_RESULT,
 									ex);
 							handler.handleMessage(message);
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java
index e75143db5..1b834853e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java
@@ -149,6 +149,13 @@ public class EclipseAdapterUtils {
     	IMessage msg = new Message(text,IMessage.ERROR,ex,loc);
     	return msg;
     }
+
+	public static IMessage makeErrorMessage(String srcFile, String text, Exception ex) {
+		ISourceLocation loc = new SourceLocation(new File(srcFile),
+													0,0,0,"");
+		IMessage msg = new Message(text,IMessage.ERROR,ex,loc);
+		return msg;
+	}
     
 	private EclipseAdapterUtils() {
 	}