Skip to content

Commit ef6ee3c

Browse files
Adopt JDK-8359732: Make standard i/o encoding related system properties StaticProperty.
1 parent b399a6d commit ef6ee3c

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,18 @@ final class Target_jdk_internal_util_StaticProperty {
9696
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
9797
private static String JAVA_PROPERTIES_DATE;
9898

99+
@Alias//
100+
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
101+
private static String STDIN_ENCODING;
102+
103+
@Alias//
104+
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
105+
private static String STDERR_ENCODING;
106+
107+
@Alias//
108+
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
109+
private static String STDOUT_ENCODING;
110+
99111
@Alias//
100112
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
101113
private static String SUN_JNU_ENCODING;
@@ -193,6 +205,10 @@ final class Target_jdk_internal_util_StaticProperty {
193205
NATIVE_ENCODING = p.getInitialProperty("native.encoding");
194206
FILE_ENCODING = p.getInitialProperty("file.encoding");
195207
JAVA_PROPERTIES_DATE = p.getInitialProperty("java.properties.date");
208+
STDIN_ENCODING = p.getInitialProperty("stdin.encoding");
209+
STDERR_ENCODING = p.getInitialProperty("stderr.encoding");
210+
STDOUT_ENCODING = p.getInitialProperty("stdout.encoding");
211+
196212
SUN_JNU_ENCODING = p.getInitialProperty("sun.jnu.encoding");
197213
JAVA_LOCALE_USE_OLD_ISO_CODES = p.getInitialProperty("java.locale.useOldISOCodes", "");
198214

@@ -297,6 +313,24 @@ public static String javaPropertiesDate() {
297313
return JAVA_PROPERTIES_DATE;
298314
}
299315

316+
@Substitute
317+
public static String javaStdinEncoding() {
318+
assert Objects.equals(STDIN_ENCODING, SystemPropertiesSupport.singleton().getInitialProperty("stdin.encoding"));
319+
return STDIN_ENCODING;
320+
}
321+
322+
@Substitute
323+
public static String javaStdoutEncoding() {
324+
assert Objects.equals(STDOUT_ENCODING, SystemPropertiesSupport.singleton().getInitialProperty("stdout.encoding"));
325+
return STDOUT_ENCODING;
326+
}
327+
328+
@Substitute
329+
public static String javaStderrEncoding() {
330+
assert Objects.equals(STDERR_ENCODING, SystemPropertiesSupport.singleton().getInitialProperty("stderr.encoding"));
331+
return STDERR_ENCODING;
332+
}
333+
300334
@Substitute
301335
public static String jnuEncoding() {
302336
assert Objects.equals(SUN_JNU_ENCODING, SystemPropertiesSupport.singleton().getInitialProperty("sun.jnu.encoding"));

0 commit comments

Comments
 (0)