Skip to content

Commit 0826b18

Browse files
committed
8343804: Show the default time zone with -XshowSettings option
Reviewed-by: rrich Backport-of: ed57c7c4c140186059432d11e00d2fbfc488d094
1 parent 2076952 commit 0826b18

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/java.base/share/classes/sun/launcher/LauncherHelper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import java.util.Properties;
7676
import java.util.ResourceBundle;
7777
import java.util.Set;
78+
import java.util.TimeZone;
7879
import java.util.TreeSet;
7980
import java.util.jar.Attributes;
8081
import java.util.jar.JarFile;
@@ -292,6 +293,8 @@ private static void printLocale(boolean summaryMode) {
292293
Locale.getDefault(Category.DISPLAY).getDisplayName());
293294
ostream.println(INDENT + "default format locale = " +
294295
Locale.getDefault(Category.FORMAT).getDisplayName());
296+
ostream.println(INDENT + "default timezone = " +
297+
TimeZone.getDefault().getID());
295298
ostream.println(INDENT + "tzdata version = " +
296299
ZoneInfoFile.getVersion());
297300
if (!summaryMode) {

test/jdk/tools/launcher/Settings.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525

2626
/*
2727
* @test
28-
* @bug 6994753 7123582 8305950 8281658 8310201
28+
* @bug 6994753 7123582 8305950 8281658 8310201 8343804
2929
* @summary tests -XshowSettings options
3030
* @modules jdk.compiler
3131
* jdk.zipfs
@@ -79,6 +79,7 @@ static void checkNotContains(TestResult tr, String str) {
7979
private static final String BAD_SEC_OPTION_MSG = "Unrecognized security subcommand";
8080
private static final String SYSTEM_SETTINGS = "Operating System Metrics:";
8181
private static final String STACKSIZE_SETTINGS = "Stack Size:";
82+
private static final String TIMEZONE_SETTINGS = "default timezone";
8283
private static final String TZDATA_SETTINGS = "tzdata version";
8384

8485
static void containsAllOptions(TestResult tr) {
@@ -92,6 +93,7 @@ static void containsAllOptions(TestResult tr) {
9293
checkContains(tr, SEC_SUMMARY_PROPS_SETTINGS);
9394
checkContains(tr, SEC_PROVIDER_SETTINGS);
9495
checkContains(tr, SEC_TLS_SETTINGS);
96+
checkContains(tr, TIMEZONE_SETTINGS);
9597
checkContains(tr, TZDATA_SETTINGS);
9698
if (System.getProperty("os.name").contains("Linux")) {
9799
checkContains(tr, SYSTEM_SETTINGS);
@@ -160,6 +162,7 @@ static void runTestOptionLocale() throws IOException {
160162
checkContains(tr, LOCALE_SETTINGS);
161163
checkContains(tr, AVAILABLE_LOCALES);
162164
checkNotContains(tr, LOCALE_SUMMARY_SETTINGS);
165+
checkContains(tr, TIMEZONE_SETTINGS);
163166
checkContains(tr, TZDATA_SETTINGS);
164167
}
165168

0 commit comments

Comments
 (0)