From 4c916f5d87aa03b737c6cd804c2cef525c4c1bc7 Mon Sep 17 00:00:00 2001 From: crawshaw Date: Sat, 8 Jan 2005 10:04:31 +0000 Subject: [PATCH 1/1] check getUri() result for null darcs-hash:20050108100431-2eb37-0d094f03498056461650553fa9b1bb3bffa378c5.gz --- src/org/ibex/core/Template.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/ibex/core/Template.java b/src/org/ibex/core/Template.java index aca83ba..1b70f30 100644 --- 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)); } -- 1.7.10.4