|
 |
221560 |
--- sun/util/calendar/LocalGregorianCalendar.java.keiths 2007-09-07 14:48:19.000000000 -0700
|
|
|
221560 |
+++ sun/util/calendar/LocalGregorianCalendar.java 2007-09-07 14:52:58.000000000 -0700
|
|
|
221560 |
@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte
|
|
|
221560 |
static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
|
|
|
221560 |
Properties calendarProps = null;
|
|
|
221560 |
try {
|
|
|
221560 |
- String homeDir = (String) AccessController.doPrivileged(
|
|
|
221560 |
- new sun.security.action.GetPropertyAction("java.home"));
|
|
|
221560 |
+ String homeDir = (String) System.getProperty("java.home");
|
|
|
221560 |
final String fname = homeDir + File.separator + "lib" + File.separator
|
|
|
221560 |
+ "calendars.properties";
|
|
|
221560 |
calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
|
|
|
221560 |
--- sun/util/calendar/ZoneInfoFile.java.keiths 2007-09-07 14:54:58.000000000 -0700
|
|
|
221560 |
+++ sun/util/calendar/ZoneInfoFile.java 2007-09-07 14:55:36.000000000 -0700
|
|
|
221560 |
@@ -1021,8 +1021,7 @@ public class ZoneInfoFile {
|
|
|
221560 |
byte[] buffer = null;
|
|
|
221560 |
|
|
|
221560 |
try {
|
|
|
221560 |
- String zi_dir = (String) AccessController.doPrivileged(
|
|
|
221560 |
- new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
|
|
|
221560 |
+ String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
|
|
|
221560 |
File dir = null;
|
|
|
221560 |
if (zi_dir != null)
|
|
|
221560 |
dir = new File(zi_dir);
|
|
|
221560 |
@@ -1035,8 +1034,7 @@ public class ZoneInfoFile {
|
|
|
221560 |
}
|
|
|
221560 |
|
|
|
221560 |
if (dir == null) {
|
|
|
221560 |
- String homeDir = (String) AccessController.doPrivileged(
|
|
|
221560 |
- new sun.security.action.GetPropertyAction("java.home"));
|
|
|
221560 |
+ String homeDir = (String) System.getProperty("java.home");
|
|
|
221560 |
zi_dir = homeDir + File.separator + "lib" + File.separator
|
|
|
221560 |
+ "zi";
|
|
|
221560 |
}
|