summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-04-13 11:40:27 (EDT)
committerpelder2006-04-13 11:40:27 (EDT)
commita1c187d75d4dcd7187dca5d6072b9f09b6dd872e (patch)
treee1b4a417c29554f7e6eafc5ad0a4a1edc03b4943
parent1bdce577716470bdfd117964e4781a0d536d73b4 (diff)
downloadorg.eclipse.jet-a1c187d75d4dcd7187dca5d6072b9f09b6dd872e.zip
org.eclipse.jet-a1c187d75d4dcd7187dca5d6072b9f09b6dd872e.tar.gz
org.eclipse.jet-a1c187d75d4dcd7187dca5d6072b9f09b6dd872e.tar.bz2
[136667] Check for null pointer, and take reasonable action if found.
-rw-r--r--plugins/org.eclipse.jet/.cvsignore1
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TagLibraryUsageManager.java4
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.jet/.cvsignore b/plugins/org.eclipse.jet/.cvsignore
index b5b06c0..3b0dc53 100644
--- a/plugins/org.eclipse.jet/.cvsignore
+++ b/plugins/org.eclipse.jet/.cvsignore
@@ -2,3 +2,4 @@ bin
help
dump.xml
models
+antbin
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TagLibraryUsageManager.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TagLibraryUsageManager.java
index 14c2718..a13da69 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TagLibraryUsageManager.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TagLibraryUsageManager.java
@@ -133,7 +133,9 @@ public class TagLibraryUsageManager
if (id != null)
{
TagLibrary tagLibrary = TagLibraryManager.getInstance().getTagLibrary(id);
- knownTag = tagLibrary.hasTag(tagNCName);
+ if(tagLibrary != null) {
+ knownTag = tagLibrary.hasTag(tagNCName);
+ }
}
return knownTag;
}