Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2009-08-20 09:22:49 -0400
committerpelder2009-08-20 09:22:49 -0400
commitc1d3f75878e3a82d4f2b0320374e79ce79d56347 (patch)
tree1d896879ad885c8f4696367839d7a1c280c92eb2
parenta51a59b949cfbd4db7538a6d29933963567f1420 (diff)
downloadorg.eclipse.jet-c1d3f75878e3a82d4f2b0320374e79ce79d56347.tar.gz
org.eclipse.jet-c1d3f75878e3a82d4f2b0320374e79ce79d56347.tar.xz
org.eclipse.jet-c1d3f75878e3a82d4f2b0320374e79ce79d56347.zip
[281554] NPE when opening any JavaJet file
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/CompilationHelper.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/CompilationHelper.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/CompilationHelper.java
index b21dad2..8d6871c 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/CompilationHelper.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/CompilationHelper.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: CompilationHelper.java,v 1.3 2009/04/06 17:55:11 pelder Exp $
+ * $Id: CompilationHelper.java,v 1.4 2009/08/20 13:22:49 pelder Exp $
*/
package org.eclipse.jet.internal.compiler;
@@ -122,7 +122,9 @@ public class CompilationHelper
builder.tagLibraryResolver(TAG_LIBRARY_RESOLVER);
builder.templateResolver(buildTemplateResolver());
builder.predefinedTagLibraries(getPredefinedTagLibraryMap());
- builder.enableEmbeddedExpressions(getDescriptor().isEnableEmbeddedExpressions());
+ final IJETBundleDescriptor descriptor = getDescriptor();
+ builder.enableEmbeddedExpressions(
+ descriptor != null ? descriptor.isEnableEmbeddedExpressions() : false);
astParser = builder.build();
}

Back to the top