From 7ed108e974e0a097a617bff03a2b7aa0ed60d11b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 1 Nov 2013 22:42:17 +0100 Subject: [PATCH] Avoid potential NPE in toString() Issue: SPR-1528 --- .../org/springframework/context/i18n/SimpleLocaleContext.java | 2 +- .../context/i18n/SimpleTimeZoneAwareLocaleContext.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java index e189d9e5d0..17d394348e 100644 --- a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java +++ b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java @@ -49,7 +49,7 @@ public class SimpleLocaleContext implements LocaleContext { @Override public String toString() { - return this.locale.toString(); + return (this.locale != null ? this.locale.toString() : "-"); } } diff --git a/spring-context/src/main/java/org/springframework/context/i18n/SimpleTimeZoneAwareLocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/SimpleTimeZoneAwareLocaleContext.java index a14db33b0d..e46a697766 100644 --- a/spring-context/src/main/java/org/springframework/context/i18n/SimpleTimeZoneAwareLocaleContext.java +++ b/spring-context/src/main/java/org/springframework/context/i18n/SimpleTimeZoneAwareLocaleContext.java @@ -27,6 +27,7 @@ import java.util.TimeZone; * a Locale but no TimeZone. * * @author Juergen Hoeller + * @author Nicholas Williams * @since 4.0 * @see LocaleContextHolder#setLocaleContext * @see LocaleContextHolder#getTimeZone() @@ -55,7 +56,7 @@ public class SimpleTimeZoneAwareLocaleContext extends SimpleLocaleContext implem @Override public String toString() { - return super.toString() + " " + this.timeZone.toString(); + return super.toString() + " " + (this.timeZone != null ? this.timeZone.toString() : "-"); } }