fixed NPE when no manifest in aspectjrt.jar

1 files changed, 6 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 ea877e9e4..6fa941d82 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
@@ -443,7 +443,12 @@ public class AjBuildManager {
 
 				try {
                     String version = null;
-                    Attributes attr = new JarFile(p).getManifest().getAttributes("org/aspectj/lang/");
+                    Manifest manifest = new JarFile(p).getManifest();
+                    if (manifest == null) {
+                    	return "no manifest found in " + p.getAbsolutePath() + 
+								", expected " + Version.text;
+                    }
+                    Attributes attr = manifest.getAttributes("org/aspectj/lang/");
                     if (null != attr) {
                         version = attr.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
                         if (null != version) {