Launcher (dev mode): more lenient detection of java debugging option

steve-s · steve-s · commit 026b21012a7b · 2020-09-10T18:05:41.000+02:00
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -344,7 +344,7 @@ private String[] getExecutableList() {
             String javaOptions = System.getenv("_JAVA_OPTIONS");
             String javaToolOptions = System.getenv("JAVA_TOOL_OPTIONS");
             for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
-                if (arg.matches("-Xrunjdwp:transport=dt_socket,server=y,address=\\d+,suspend=y")) {
+                if (arg.matches("(-Xrunjdwp:|-agentlib:jdwp=).*suspend=y.*")) {
                     arg = arg.replace("suspend=y", "suspend=n");
                 }
                 if ((javaOptions != null && javaOptions.contains(arg)) || (javaToolOptions != null && javaToolOptions.contains(arg))) {

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ private String[] getExecutableList() {`
`344`	`344`	`String javaOptions = System.getenv("_JAVA_OPTIONS");`
`345`	`345`	`String javaToolOptions = System.getenv("JAVA_TOOL_OPTIONS");`
`346`	`346`	`for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {`
`347`		`- if (arg.matches("-Xrunjdwp:transport=dt_socket,server=y,address=\\d+,suspend=y")) {`
	`347`	`+ if (arg.matches("(-Xrunjdwp:\|-agentlib:jdwp=).suspend=y.")) {`
`348`	`348`	`arg = arg.replace("suspend=y", "suspend=n");`
`349`	`349`	`}`
`350`	`350`	`if ((javaOptions != null && javaOptions.contains(arg)) \|\| (javaToolOptions != null && javaToolOptions.contains(arg))) {`