diff --git a/Zutil.jar b/Zutil.jar index 445d14d..54a3c41 100755 Binary files a/Zutil.jar and b/Zutil.jar differ diff --git a/src/zutil/db/bean/DBBean.java b/src/zutil/db/bean/DBBean.java old mode 100644 new mode 100755 index b92a82b..d662215 --- a/src/zutil/db/bean/DBBean.java +++ b/src/zutil/db/bean/DBBean.java @@ -465,9 +465,8 @@ public abstract class DBBean { if( !Modifier.isPublic( field.getModifiers())) field.setAccessible(true); - // Set basic datatype + // Set basic data type if( o == null && !Object.class.isAssignableFrom( field.getType() ) ){ - logger.fine("Trying to set primitive data type to null!"); if( field.getType() == Integer.TYPE ) field.setInt(this, 0); else if( field.getType() == Character.TYPE )field.setChar(this, (char) 0); else if( field.getType() == Byte.TYPE ) field.setByte(this, (byte) 0); @@ -477,8 +476,13 @@ public abstract class DBBean { else if( field.getType() == Double.TYPE ) field.setDouble(this, 0d); else if( field.getType() == Boolean.TYPE ) field.setBoolean(this, false); } - else - field.set(this, o); + else { + // Some special cases + if(field.getType() == Boolean.TYPE && o instanceof Integer) + field.setBoolean(this, ((Integer)o) > 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() {