]> source.dussan.org Git - aspectj.git/commitdiff
fix for 205949: "Unattended install of aspectj builds on the Mac fails". just had...
authoraclement <aclement>
Fri, 26 Oct 2007 14:13:14 +0000 (14:13 +0000)
committeraclement <aclement>
Fri, 26 Oct 2007 14:13:14 +0000 (14:13 +0000)
build/src/$installer$/org/aspectj/Main.java

index 147a88fd3610f467dc02f531860ba025acb7492b..d601b1687d520343437656b96a5e27a960c74cf2 100644 (file)
@@ -845,7 +845,7 @@ abstract class WizardPane {
             buf.append(text.substring(lastIndex, startIndex));
             String key = text.substring(startIndex+2, endIndex);
             lastIndex = endIndex+1;
-            Object replaceText = map.get(key);
+            Object replaceText = (map==null?null:map.get(key));
             //System.out.println("key: " + key + " -> " + replaceText);
             if (replaceText == null) replaceText = "NOT_FOUND";
             buf.append(replaceText.toString());
@@ -856,7 +856,7 @@ abstract class WizardPane {
     }
 
     public static String applyProperties(String text) {
-        return applyProperties(text, context.getProperties());
+       return applyProperties(text, (context==null?null:context.getProperties())); 
     }
 
     protected String loadText(String filename) {