Skip to content

Commit 88320d3

Browse files
committed
[GR-33942] JDK17 fixes
PullRequest: graalpython/1986
2 parents ff9adfd + 98e5ba3 commit 88320d3

File tree

5 files changed

+242
-79
lines changed

5 files changed

+242
-79
lines changed

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,13 +388,13 @@ private static String getLauncherExecName() {
388388
* <dt><b>Program name is an absolute path</b></dt>
389389
* <dd>Just return {@code program}.</dd>
390390
* <dt><b>Program name is a relative path</b></dt>
391-
* <dd>it will resolve it to an absolute path. E.g. {@code "./python3"} will become {@code
391+
* <dd>it will resolve it to an absolute path. E.g. {@code "./python3"} will become {@code
392392
* "<current_working_dir>/python3"}/dd>
393393
* <dt><b>Program name is neither an absolute nor a relative path</b></dt>
394394
* <dd>It will resolve the program name wrt. to the {@code PATH} env variable. Since it may be
395395
* that the {@code PATH} variable is not available, this method will return {@code null}</dd>
396396
* </dl>
397-
*
397+
*
398398
* @param program The program name as passed in the process' argument vector (position 0).
399399
* @return The absolute path to the program or {@code null}.
400400
*/
@@ -1027,11 +1027,9 @@ static List<String> getCmdline(List<String> args, List<String> subProcessDefs) {
10271027
switch (System.getProperty("java.vm.name")) {
10281028
case "Java HotSpot(TM) 64-Bit Server VM":
10291029
cmd.add("-server");
1030-
cmd.add("-d64");
10311030
break;
10321031
case "Java HotSpot(TM) 64-Bit Client VM":
10331032
cmd.add("-client");
1034-
cmd.add("-d64");
10351033
break;
10361034
default:
10371035
break;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/ASN1Helper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public class ASN1Helper {
6868
static final String ASN1_EMAIL = "EMAIL";
6969

7070
static final String OID_CRL_DISTRIBUTION_POINTS = "2.5.29.31";
71-
static final String OID_OCSP = "1.3.6.1.5.5.7.48.1";
72-
static final String OID_CA_ISSUERS = "1.3.6.1.5.5.7.48.2";
71+
static final byte[] OID_OCSP = new byte[]{/* 1, 3, 6, */ 1, 5, 5, 7, 48, 1};
72+
static final byte[] OID_CA_ISSUERS = new byte[]{/* 1, 3, 6, */ 1, 5, 5, 7, 48, 2};
7373
static final String OID_AUTHORITY_INFO_ACCESS = "1.3.6.1.5.5.7.1.1";
7474

7575
private static final Map<String, String> javaToName = new HashMap<>();

0 commit comments

Comments
 (0)