From 500b45e12dccc254e2d1cbd9513653ae939ef349 Mon Sep 17 00:00:00 2001
From: Justin Lu <justin.lu@oracle.com>
Date: Fri, 13 Jan 2023 18:13:50 +0000
Subject: [PATCH] 8299865: Unnecessary NullPointerException catch in
java.util.TimeZone#setDefaultZone
Reviewed-by: lancea, iris, naoto, aturbanov
---
src/java.base/share/classes/java/util/TimeZone.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/java.base/share/classes/java/util/TimeZone.java b/src/java.base/share/classes/java/util/TimeZone.java
index 036dc510b08..8837bda2beb 100644
--- a/src/java.base/share/classes/java/util/TimeZone.java
+++ b/src/java.base/share/classes/java/util/TimeZone.java
@@ -674,13 +674,8 @@ public abstract class TimeZone implements Serializable, Cloneable {
// if the time zone ID is not set (yet), perform the
// platform to Java time zone ID mapping.
if (zoneID == null || zoneID.isEmpty()) {
- String javaHome = StaticProperty.javaHome();
- try {
- zoneID = getSystemTimeZoneID(javaHome);
- if (zoneID == null) {
- zoneID = GMT_ID;
- }
- } catch (NullPointerException e) {
+ zoneID = getSystemTimeZoneID(StaticProperty.javaHome());
+ if (zoneID == null) {
zoneID = GMT_ID;
}
}