X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FTemplate.java;h=3ec987332913bc4613c71f58d5e2830964aeba6c;hp=2dfbacfeb1092780f81686762eb6bf10bb6ee37f;hb=1f1318b8c0ba0bc472c263e54079cbaa6e303fe0;hpb=074a83257de30c3cd7409b0840ab6f27ed0e93b5

diff --git a/src/be/nikiroo/fanfix/library/Template.java b/src/be/nikiroo/fanfix/library/Template.java
index 2dfbacf..3ec9873 100644
--- a/src/be/nikiroo/fanfix/library/Template.java
+++ b/src/be/nikiroo/fanfix/library/Template.java
@@ -64,31 +64,27 @@ public class Template {
 
 			i++;
 		}
-		
+
 		InputStream in = IOUtils.openResource(location, name);
-		
-		InputStream stream;
-		
-		stream = IOUtils.openResource(location, name);
-		System.out.println("SOURCE = (("  + IOUtils.readSmallStream(stream) + "))");
-		stream=new ReplaceInputStream(IOUtils.openResource(location, name), from, to);
-		System.out.println("RESULT = (("  + IOUtils.readSmallStream(stream) + "))");
-		
-		
 		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;
 	}