summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-05-09 15:10:28 (EDT)
committer pelder2007-05-09 15:10:28 (EDT)
commit4aaf3f4d25b5a66ef0bd1c9759b36f7492f733b8 (patch)
tree926f9ef3c7ef8bc1e77ff47aed3e062255a86eff
parent76370c9230386f0c07fb3e6016342c1e0a91752d (diff)
downloadorg.eclipse.jet-4aaf3f4d25b5a66ef0bd1c9759b36f7492f733b8.zip
org.eclipse.jet-4aaf3f4d25b5a66ef0bd1c9759b36f7492f733b8.tar.gz
org.eclipse.jet-4aaf3f4d25b5a66ef0bd1c9759b36f7492f733b8.tar.bz2
[186229] NullPointerException in JET Builder if JET project is not also a plug-in project
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java
index 51caa3d..f2f9069 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: WorkspaceCompiler.java,v 1.2 2007/05/03 18:54:11 pelder Exp $
+ * $Id: WorkspaceCompiler.java,v 1.3 2007/05/09 19:10:28 pelder Exp $
*/
package org.eclipse.jet.internal.builder;
@@ -91,14 +91,17 @@ public class WorkspaceCompiler implements IJETCompiler, ICompilerOutput, ITagLib
JETCompilerOptions.getIntOption(options, JETCompilerOptions.OPTION_JET_SPECIFICATION_VERSION),
this)
.templateResolver(buildTemplateResolver(project, options))
- .predefinedTagLibraries(getPredefinitionMap(descriptor.getTagLibraryReferences()))
.options(options)
.tagLibraryResolver(this);
- final String templateLoaderClass = descriptor.getTemplateLoaderClass();
- if(templateLoaderClass != null && templateLoaderClass.length() > 0) {
- builder.templateLoaderFQN(templateLoaderClass);
+ if(descriptor != null) {
+ builder.predefinedTagLibraries(getPredefinitionMap(descriptor.getTagLibraryReferences()));
+ final String templateLoaderClass = descriptor.getTemplateLoaderClass();
+ if(templateLoaderClass != null && templateLoaderClass.length() > 0) {
+ builder.templateLoaderFQN(templateLoaderClass);
+ }
}
+
if(savedState != null) {
builder.savedState(savedState);
}