diff options
Diffstat (limited to 'android/guava/src/com/google/common/base/Strings.java')
| -rw-r--r-- | android/guava/src/com/google/common/base/Strings.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/guava/src/com/google/common/base/Strings.java b/android/guava/src/com/google/common/base/Strings.java index 1c636dcfc..475851706 100644 --- a/android/guava/src/com/google/common/base/Strings.java +++ b/android/guava/src/com/google/common/base/Strings.java @@ -298,8 +298,11 @@ public final class Strings { } private static String lenientToString(@NullableDecl Object o) { + if (o == null) { + return "null"; + } try { - return String.valueOf(o); + return o.toString(); } catch (Exception e) { // Default toString() behavior - see Object.toString() String objectToString = |