Use -m prefix only when the main class is contained in a module (#304)

testforstephen · web-flow · commit ac7d26bcfd57 · 2019-10-15T11:06:43.000+08:00
* Use -m prefix only when the main class is contained in a module

Signed-off-by: Jinbo Wang &lt;jinbwan@microsoft.com&gt;

* Fix -m args

Signed-off-by: Jinbo Wang &lt;jinbwan@microsoft.com&gt;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugUtility.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugUtility.java
@@ -148,7 +148,7 @@ public static IDebugSession launch(VirtualMachineManager vmManager,
 
         // For java 9 project, should specify "-m $MainClass".
         String[] mainClasses = mainClass.split("/");
-        if (StringUtils.isNotBlank(modulePaths) || mainClasses.length == 2) {
+        if (mainClasses.length == 2) {
             mainClass = "-m " + mainClass;
         }
         if (StringUtils.isNotBlank(programArguments)) {
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
@@ -207,7 +207,7 @@ public static String[] constructLaunchCommands(LaunchArguments launchArguments,
         }
         // For java 9 project, should specify "-m $MainClass".
         String[] mainClasses = launchArguments.mainClass.split("/");
-        if (ArrayUtils.isNotEmpty(launchArguments.modulePaths) || mainClasses.length == 2) {
+        if (mainClasses.length == 2) {
             launchCmds.add("-m");
         }
         launchCmds.add(launchArguments.mainClass);

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public static IDebugSession launch(VirtualMachineManager vmManager,`
`148`	`148`
`149`	`149`	`// For java 9 project, should specify "-m $MainClass".`
`150`	`150`	`String[] mainClasses = mainClass.split("/");`
`151`		`- if (StringUtils.isNotBlank(modulePaths) \|\| mainClasses.length == 2) {`
	`151`	`+ if (mainClasses.length == 2) {`
`152`	`152`	`mainClass = "-m " + mainClass;`
`153`	`153`	`}`
`154`	`154`	`if (StringUtils.isNotBlank(programArguments)) {`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public static String[] constructLaunchCommands(LaunchArguments launchArguments,`
`207`	`207`	`}`
`208`	`208`	`// For java 9 project, should specify "-m $MainClass".`
`209`	`209`	`String[] mainClasses = launchArguments.mainClass.split("/");`
`210`		`- if (ArrayUtils.isNotEmpty(launchArguments.modulePaths) \|\| mainClasses.length == 2) {`
	`210`	`+ if (mainClasses.length == 2) {`
`211`	`211`	`launchCmds.add("-m");`
`212`	`212`	`}`
`213`	`213`	`launchCmds.add(launchArguments.mainClass);`