1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6999337: java.exe fails to start if some directory names in path to java binaries contain Russian characters

Browse Source 
Updated to make sure the system properties are accessable by vm during initialization

Reviewed-by: alanb, mchung
This commit is contained in:
Xueming Shen 2011-02-16 11:11:31 -08:00
parent 560ab81595
commit 2c97d8fb44
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jdk/src/share/classes/java/lang/System.java
View File

@ -1102,6 +1102,18 @@ public final class System {
* Initialize the system class. Called after thread initialization. * Initialize the system class. Called after thread initialization.
*/ */
private static void initializeSystemClass() { private static void initializeSystemClass() {
// VM might invoke JNU_NewStringPlatform() to set those encoding
// sensitive properties (user.home, user.name, boot.class.path, etc.)
// during "props" initialization, in which it may need access, via
// System.getProperty(), to the related system encoding property that
// have been initialized (put into "props") at early stage of the
// initialization. So make sure the "props" is available at the
// very beginning of the initialization and all system properties to
// be put into it directly.
props = new Properties();
initProperties(props); // initialized by the VM
// There are certain system configurations that may be controlled by // There are certain system configurations that may be controlled by
// VM options such as the maximum amount of direct memory and // VM options such as the maximum amount of direct memory and
// Integer cache size used to support the object identity semantics // Integer cache size used to support the object identity semantics
@ -1112,7 +1124,12 @@ public final class System {
// //
// See java.lang.Integer.IntegerCache and the // See java.lang.Integer.IntegerCache and the
// sun.misc.VM.saveAndRemoveProperties method for example. // sun.misc.VM.saveAndRemoveProperties method for example.
props = initSystemProperties(); //
// Save a private copy of the system properties object that
// can only be accessed by the internal implementation. Remove
// certain system properties that are not intended for public access.
sun.misc.VM.saveAndRemoveProperties(props);
lineSeparator = props.getProperty("line.separator"); lineSeparator = props.getProperty("line.separator");
sun.misc.Version.init(); sun.misc.Version.init();
@ -1123,7 +1140,6 @@ public final class System {
setIn0(new BufferedInputStream(fdIn)); setIn0(new BufferedInputStream(fdIn));
setOut0(new PrintStream(new BufferedOutputStream(fdOut, 128), true)); setOut0(new PrintStream(new BufferedOutputStream(fdOut, 128), true));
setErr0(new PrintStream(new BufferedOutputStream(fdErr, 128), true)); setErr0(new PrintStream(new BufferedOutputStream(fdErr, 128), true));
// Load the zip library now in order to keep java.util.zip.ZipFile // Load the zip library now in order to keep java.util.zip.ZipFile
// from trying to use itself to load this library later. // from trying to use itself to load this library later.
loadLibrary("zip"); loadLibrary("zip");
@ -1151,18 +1167,6 @@ public final class System {
setJavaLangAccess(); setJavaLangAccess();
} }
private static Properties initSystemProperties() {
Properties props = new Properties();
initProperties(props); // initialized by the VM
// Save a private copy of the system properties object that
// can only be accessed by the internal implementation. Remove
// certain system properties that are not intended for public access.
sun.misc.VM.saveAndRemoveProperties(props);
return props;
}
private static void setJavaLangAccess() { private static void setJavaLangAccess() {
// Allow privileged classes outside of java.lang // Allow privileged classes outside of java.lang
sun.misc.SharedSecrets.setJavaLangAccess(new sun.misc.JavaLangAccess(){ sun.misc.SharedSecrets.setJavaLangAccess(new sun.misc.JavaLangAccess(){