From a1da233093e2e4b2ba0757e3cad8c91a465c8ab7 Mon Sep 17 00:00:00 2001 From: Orhan Obut Date: Tue, 6 Jun 2017 13:04:59 +0200 Subject: [PATCH 1/2] Return "null" when a null object is used with Logger.d(null) --- logger/src/main/java/com/orhanobut/logger/Utils.java | 3 +++ logger/src/test/java/com.orhanobut.logger/UtilsTest.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/logger/src/main/java/com/orhanobut/logger/Utils.java b/logger/src/main/java/com/orhanobut/logger/Utils.java index 90d39b0e..28eb537d 100644 --- a/logger/src/main/java/com/orhanobut/logger/Utils.java +++ b/logger/src/main/java/com/orhanobut/logger/Utils.java @@ -109,6 +109,9 @@ static String logLevel(int value) { } public static String toString(Object object) { + if (object == null) { + return "null"; + } if (!object.getClass().isArray()) { return object.toString(); } diff --git a/logger/src/test/java/com.orhanobut.logger/UtilsTest.java b/logger/src/test/java/com.orhanobut.logger/UtilsTest.java index 31c6b3f8..37d68d02 100644 --- a/logger/src/test/java/com.orhanobut.logger/UtilsTest.java +++ b/logger/src/test/java/com.orhanobut.logger/UtilsTest.java @@ -57,6 +57,10 @@ public class UtilsTest { assertThat(Utils.toString(object)).isEqualTo("Test"); } + @Test public void toStringWithNull() { + assertThat(Utils.toString(null)).isEqualTo("null"); + } + @Test public void primitiveArrayToString() { Object booleanArray = new boolean[]{true, false, true}; assertThat(Utils.toString(booleanArray)).isEqualTo("[true, false, true]"); From d847deaba988b018101fad69a63337846d9003cf Mon Sep 17 00:00:00 2001 From: Orhan Obut Date: Tue, 6 Jun 2017 13:05:26 +0200 Subject: [PATCH 2/2] Bump version to 2.1.1 --- README.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d487c7b..258e44f9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Simple, pretty and powerful logger for android ### Setup Download ```groovy -compile 'com.orhanobut:logger:2.1.0' +compile 'com.orhanobut:logger:2.1.1' ``` Initialize diff --git a/gradle.properties b/gradle.properties index c1579b64..1ec89437 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=2.1.0 +VERSION_NAME=2.1.1 GROUP=com.orhanobut POM_DESCRIPTION=Simple, Pretty and Advanced Logger