X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FTemplate.java;h=3ec987332913bc4613c71f58d5e2830964aeba6c;hp=3536d5f12efccf7da066ce4b1d140553c633e631;hb=1f1318b8c0ba0bc472c263e54079cbaa6e303fe0;hpb=cfdaf6052ddc5ca44cf19f1f6d9f154cc8443024 diff --git a/src/be/nikiroo/fanfix/library/Template.java b/src/be/nikiroo/fanfix/library/Template.java index 3536d5f..3ec9873 100644 --- a/src/be/nikiroo/fanfix/library/Template.java +++ b/src/be/nikiroo/fanfix/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; }