From f8cf9e1ae1b38478dfea257d29d80491c2ca8c91 Mon Sep 17 00:00:00 2001 From: Ram Viswanadha Date: Mon, 28 Nov 2005 20:50:56 +0000 Subject: [PATCH] ICU-4422 keep default timezone in synch with JDK's X-SVN-Rev: 18832 --- icu4j/src/com/ibm/icu/dev/test/TestFmwk.java | 1 + icu4j/src/com/ibm/icu/util/TimeZone.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java index daf417967d8..8d56e2b8794 100755 --- a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java +++ b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java @@ -816,6 +816,7 @@ public class TestFmwk extends AbstractTestLog { pw.println(" remainder of the target as above. Target matching is case-insensitive."); pw.println(); pw.println(" If multiple targets are provided, each is executed in order."); + pw.flush(); } public static String hex(char ch) { diff --git a/icu4j/src/com/ibm/icu/util/TimeZone.java b/icu4j/src/com/ibm/icu/util/TimeZone.java index 059f93e2db6..50e82cd3375 100755 --- a/icu4j/src/com/ibm/icu/util/TimeZone.java +++ b/icu4j/src/com/ibm/icu/util/TimeZone.java @@ -15,6 +15,7 @@ import java.util.Locale; import java.util.MissingResourceException; import com.ibm.icu.impl.ICUResourceBundle; +import com.ibm.icu.impl.TimeZoneAdapter; import com.ibm.icu.impl.ZoneMeta; import com.ibm.icu.text.SimpleDateFormat; @@ -709,11 +710,11 @@ abstract public class TimeZone implements Serializable, Cloneable { defaultZone = tz; // Keep java.util.TimeZone default in sync so java.util.Date // can interoperate with com.ibm.icu.util classes. - //java.util.TimeZone jdkZone = null; + java.util.TimeZone jdkZone = null; if (tz != null) { - //jdkZone = TimeZoneAdapter.wrap(tz); + jdkZone = TimeZoneAdapter.wrap(tz); } - //java.util.TimeZone.setDefault(jdkZone); + java.util.TimeZone.setDefault(jdkZone); } /**