]>
Commit | Line | Data |
---|---|---|
0eb7e566 ER |
1 | --- sun/util/calendar/LocalGregorianCalendar.java.keiths 2007-09-07 14:48:19.000000000 -0700 |
2 | +++ sun/util/calendar/LocalGregorianCalendar.java 2007-09-07 14:52:58.000000000 -0700 | |
3 | @@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte | |
4 | static LocalGregorianCalendar getLocalGregorianCalendar(String name) { | |
5 | Properties calendarProps = null; | |
6 | try { | |
7 | - String homeDir = (String) AccessController.doPrivileged( | |
8 | - new sun.security.action.GetPropertyAction("java.home")); | |
9 | + String homeDir = (String) System.getProperty("java.home"); | |
10 | final String fname = homeDir + File.separator + "lib" + File.separator | |
11 | + "calendars.properties"; | |
12 | calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { | |
13 | --- sun/util/calendar/ZoneInfoFile.java.keiths 2007-09-07 14:54:58.000000000 -0700 | |
14 | +++ sun/util/calendar/ZoneInfoFile.java 2007-09-07 14:55:36.000000000 -0700 | |
15 | @@ -1021,8 +1021,7 @@ public class ZoneInfoFile { | |
16 | byte[] buffer = null; | |
17 | ||
18 | try { | |
19 | - String zi_dir = (String) AccessController.doPrivileged( | |
20 | - new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); | |
21 | + String zi_dir = (String) System.getProperty("user.zoneinfo.dir"); | |
22 | File dir = null; | |
23 | if (zi_dir != null) | |
24 | dir = new File(zi_dir); | |
25 | @@ -1035,8 +1034,7 @@ public class ZoneInfoFile { | |
26 | } | |
27 | ||
28 | if (dir == null) { | |
29 | - String homeDir = (String) AccessController.doPrivileged( | |
30 | - new sun.security.action.GetPropertyAction("java.home")); | |
31 | + String homeDir = (String) System.getProperty("java.home"); | |
32 | zi_dir = homeDir + File.separator + "lib" + File.separator | |
33 | + "zi"; | |
34 | } |