From 0fae09d687bc5bb1ecb155e94ee1e49300ef3576 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Sat, 12 Dec 2015 00:25:17 +0100 Subject: [PATCH] Some small fixes --- Zutil.jar | Bin 1185622 -> 1185635 bytes src/zutil/db/bean/DBBean.java | 12 ++++++++---- src/zutil/parser/Templator.java | 2 +- test/zutil/test/TemplatorTest.java | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) mode change 100644 => 100755 src/zutil/db/bean/DBBean.java diff --git a/Zutil.jar b/Zutil.jar index 445d14dcace140eba0acb546fac94e77c9d9a8e2..54a3c41938717f40f1d802b948851e6fcd1f8f95 100755 GIT binary patch delta 15163 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 =hLz-@59h%svHUTZxzhJ>6LI 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 0 ); // Convert an Integer to boolean + else + field.set(this, o); + } } catch (Exception e) { logger.log(Level.SEVERE, e.getMessage(), e); } diff --git a/src/zutil/parser/Templator.java b/src/zutil/parser/Templator.java index 616927d..fffd07f 100755 --- a/src/zutil/parser/Templator.java +++ b/src/zutil/parser/Templator.java @@ -418,7 +418,7 @@ public class Templator { else str.append(obj.toString()); else - str.append("{{").append(tag).append("}}"); + str.append("null"); } } } diff --git a/test/zutil/test/TemplatorTest.java b/test/zutil/test/TemplatorTest.java index e17541d..45b8120 100755 --- a/test/zutil/test/TemplatorTest.java +++ b/test/zutil/test/TemplatorTest.java @@ -70,7 +70,7 @@ public class TemplatorTest { @Test public void attributeEmptyTest(){ Templator tmpl = new Templator("{{test}}"); - assertEquals("{{test}}", tmpl.compile()); + assertEquals("null", tmpl.compile()); } @Test public void attributeSimpleTest() {