From c1126e37273c10ecc181bee9dc29d1c8fb05a073 Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@openjdk.org>
Date: Fri, 30 Nov 2012 08:17:02 +0100
Subject: [PATCH] 7155168: java/util/TimeZone/Bug6912560.java: expected
 Asia/Tokyo

Reviewed-by: okutsu
---
 jdk/test/java/util/TimeZone/Bug6912560.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jdk/test/java/util/TimeZone/Bug6912560.java b/jdk/test/java/util/TimeZone/Bug6912560.java
index c641f3329c6..e88ffb04c19 100644
--- a/jdk/test/java/util/TimeZone/Bug6912560.java
+++ b/jdk/test/java/util/TimeZone/Bug6912560.java
@@ -40,6 +40,9 @@ public class Bug6912560 {
         // set the user.timezone property
         String tzname = "Asia/Tokyo";
         System.setProperty("user.timezone", tzname);
+        // make sure the timezone will be initialized by
+        // the next call to TimeZone.getDefault()
+        TimeZone.setDefault(null);
 
         System.setSecurityManager(new SecurityManager());
         TimeZone tz = TimeZone.getDefault();