X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=library%2FTemplate.java;fp=library%2FTemplate.java;h=3ec987332913bc4613c71f58d5e2830964aeba6c;hp=3536d5f12efccf7da066ce4b1d140553c633e631;hb=977f60a2bf84634a5343c8b244606ae9b4edda0b;hpb=258e065f81071a861711ef935dca3ec5563f4360 diff --git a/library/Template.java b/library/Template.java index 3536d5f..3ec9873 100644 --- a/library/Template.java +++ b/library/Template.java @@ -64,22 +64,27 @@ public class Template { i++; } - + InputStream in = IOUtils.openResource(location, name); return new ReplaceInputStream(in, from, to); } public synchronized Template set(String key, String value) { - values.put(key, value); + values.put(key, value == null ? "" : key); valuesTemplate.remove(key); valuesTemplateList.remove(key); return this; } public synchronized Template set(String key, Template value) { + if (value == null) { + return set(key, ""); + } + values.remove(key); valuesTemplate.put(key, value); valuesTemplateList.remove(key); + return this; }