equal
deleted
inserted
replaced
43 import java.util.Collections; |
43 import java.util.Collections; |
44 import java.util.HashMap; |
44 import java.util.HashMap; |
45 import java.util.List; |
45 import java.util.List; |
46 import java.util.Locale; |
46 import java.util.Locale; |
47 import java.util.Map; |
47 import java.util.Map; |
48 import java.util.Map.Entry; |
|
49 import java.util.Objects; |
|
50 import java.util.Set; |
|
51 import java.util.SimpleTimeZone; |
48 import java.util.SimpleTimeZone; |
52 import java.util.concurrent.ConcurrentHashMap; |
49 import java.util.concurrent.ConcurrentHashMap; |
53 import java.util.zip.CRC32; |
50 import java.util.zip.CRC32; |
|
51 |
|
52 import jdk.internal.util.StaticProperty; |
54 import sun.security.action.GetPropertyAction; |
53 import sun.security.action.GetPropertyAction; |
55 |
54 |
56 /** |
55 /** |
57 * Loads TZDB time-zone rules for j.u.TimeZone |
56 * Loads TZDB time-zone rules for j.u.TimeZone |
58 * <p> |
57 * <p> |
250 .toLowerCase(Locale.ROOT); |
249 .toLowerCase(Locale.ROOT); |
251 USE_OLDMAPPING = (oldmapping.equals("yes") || oldmapping.equals("true")); |
250 USE_OLDMAPPING = (oldmapping.equals("yes") || oldmapping.equals("true")); |
252 AccessController.doPrivileged(new PrivilegedAction<Void>() { |
251 AccessController.doPrivileged(new PrivilegedAction<Void>() { |
253 public Void run() { |
252 public Void run() { |
254 try { |
253 try { |
255 String libDir = System.getProperty("java.home") + File.separator + "lib"; |
254 String libDir = StaticProperty.javaHome() + File.separator + "lib"; |
256 try (DataInputStream dis = new DataInputStream( |
255 try (DataInputStream dis = new DataInputStream( |
257 new BufferedInputStream(new FileInputStream( |
256 new BufferedInputStream(new FileInputStream( |
258 new File(libDir, "tzdb.dat"))))) { |
257 new File(libDir, "tzdb.dat"))))) { |
259 load(dis); |
258 load(dis); |
260 } |
259 } |