aboutsummaryrefslogtreecommitdiffstats
path: root/ajde
diff options
context:
space:
mode:
authormkersten <mkersten>2005-09-08 19:19:11 +0000
committermkersten <mkersten>2005-09-08 19:19:11 +0000
commit51874377b6350b80287730e6b8e0cc8a76c284c4 (patch)
tree9f87a8f3ee895870937e9f88d01584c132ca3332 /ajde
parent2d21db05869efd4715e8a4a10810c18a89093bfb (diff)
downloadaspectj-51874377b6350b80287730e6b8e0cc8a76c284c4.tar.gz
aspectj-51874377b6350b80287730e6b8e0cc8a76c284c4.zip
Fix for Bug #109016: NullPointerException when building configuration
Diffstat (limited to 'ajde')
-rw-r--r--ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 504f2b927..7be16e8dd 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -292,11 +292,13 @@ public class CompilerAdapter {
if (sourceLevel.equals(CompilerOptions.VERSION_1_5)) {
optionsToSet.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
} else {
- String setCompliance = (String) optionsToSet.get( CompilerOptions.OPTION_Compliance);
- if ( ! (setCompliance.equals(CompilerOptions.VERSION_1_4 )
- && slVersion.equals(CompilerOptions.VERSION_1_3)) ) {
- optionsToSet.put(CompilerOptions.OPTION_Source, slVersion);
- }
+ if (optionsToSet.containsKey(CompilerOptions.OPTION_Compliance)) {
+ String setCompliance = (String) optionsToSet.get(CompilerOptions.OPTION_Compliance);
+ if ( ! (setCompliance.equals(CompilerOptions.VERSION_1_4 )
+ && slVersion.equals(CompilerOptions.VERSION_1_3)) ) {
+ optionsToSet.put(CompilerOptions.OPTION_Source, slVersion);
+ }
+ }
}
}