check getUri() result for null

darcs-hash:20050108100431-2eb37-0d094f03498056461650553fa9b1bb3bffa378c5.gz

diff --git a/src/org/ibex/core/Template.java b/src/org/ibex/core/Template.java
index aca83ba..1b70f30 100644 (file)
--- a/src/org/ibex/core/Template.java
+++ b/src/org/ibex/core/Template.java
@@ -207,7 +207,8 @@ public class Template {
 
             // FIXME: This is all wrong
             if (!("ibex://ui".equals(c.getUri()) && "box".equals(c.getLocalName()))) {
-                String tagname = (c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName();
+                String tagname = (c.getUri() == null || "".equals(c.getUri()) ? "" :
+                                 (c.getUri() + ".")) + c.getLocalName();
                 // GROSS hack
                 try {
                     // GROSSER hack
@@ -248,7 +249,7 @@ public class Template {
                 }
 
                 // treat value starting with '.' as resource reference
-                String uri = a.getUri(i); if (!uri.equals("")) uri = '.' + uri;
+                String uri = a.getUri(i); if (uri != null && !uri.equals("")) uri = '.' + uri;
                 keys.add(a.getKey(i));
                 vals.add((a.getVal(i).startsWith(".") ? uri : "") + a.getVal(i));
             }