#359 Updated Convert.ToBytes(Object) to be null-friendly

Author: ericbn

javalite-common/src/main/java/org/javalite/common/Convert.java

@@ -62,9 +62,9 @@ private Convert() {
      * @return string representation of an object, including {@link java.sql.Clob}.
      */
     public static String toString(Object value) {
-        if(value == null) {
+        if (value == null) {
             return null;
-        } else if(value instanceof Clob) {
+        } else if (value instanceof Clob) {
             return clobToString((Clob) value);
         } else {
             return value.toString();
@@ -403,10 +403,14 @@ public static BigDecimal toBigDecimal(Object value){
      * @return value converted to byte array.
      */
     public static byte[] toBytes(Object value) {
-        if (value instanceof Blob) {
+        if (value == null) {
+            return null;
+        } else if (value instanceof byte[]) {
+            return (byte[]) value;
+        } else if (value instanceof Blob) {
             return toBytes((Blob) value);
         } else {
-            return value instanceof byte[] ? (byte[]) value : toString(value).getBytes();
+            return toString(value).getBytes();
         }
     }
 

javalite-common/src/test/java/org/javalite/common/ConvertTest.java

@@ -310,4 +310,9 @@ public void shouldCovertToIsoString() {
         cal.set(2014, 11, 31, 23, 59, 59);
         the(Convert.toIsoString(cal.getTime())).shouldBeEqual("2014-12-31T23:59:59Z");
     }
+
+    @Test
+    public void shouldToBytesCovertNull() {
+        the(Convert.toBytes((Object) null)).shouldBeNull();
+    }
 }