Guards against calling setTimeZone() with null argument. wocommunity#774

paulhoadley · Jun 27, 2016 · 6a195fa · 6a195fa
1 parent e60d618
commit 6a195fa
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXTimeZoneDetector.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXTimeZoneDetector.java
@@ -4,6 +4,8 @@
 import java.util.TimeZone;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOApplication;
 import com.webobjects.appserver.WOContext;
@@ -47,6 +49,11 @@ public class ERXTimeZoneDetector extends ERXStatelessComponent {
 	 */
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * Logger
+	 */
+	private static final Logger log = LoggerFactory.getLogger(ERXTimeZoneDetector.class);
+
 	public static final String TIMEZONE_SESSION_KEY = "detectedTimeZone";
 
 	private static final String TIMEZONE_DATA_KEY = "_timezone";
@@ -145,7 +152,14 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 			boolean dst = "1".equals(data[1]);
 			boolean southern = "1".equals(data[2]);
 			TimeZone tz = zoneWithRawOffset(rawOffset, dst, southern);
-			session.setTimeZone(tz);
+			// Call ERXSession.setTimeZone() if tz is not null
+			// https://github.com/wocommunity/wonder/issues/774
+			if (tz != null) {
+				session.setTimeZone(tz);
+			}
+			else {
+				log.warn("Unable to find a timezone for '{}'.", zoneString);
+			}
 		}
 	}