dbeaver#35145 Add sanity check (dbeaver#35556)

ShadelessFox · web-flow · commit 04fdebcd4292 · 2024-09-11T17:48:15.000+02:00
diff --git a/plugins/org.jkiss.dbeaver.launcher/src/org/jkiss/dbeaver/launcher/DBeaverLauncher.java b/plugins/org.jkiss.dbeaver.launcher/src/org/jkiss/dbeaver/launcher/DBeaverLauncher.java
@@ -2701,7 +2701,7 @@ private void mergeWithSystemProperties(Properties source, Properties userConfigu
     }
 
     private void setupVMProperties() {
-        if (Stream.of(vmargs).noneMatch(arg -> arg.startsWith("-D" + PROP_LOG_INCLUDE_COMMAND_LINE))) {
+        if (vmargs != null && Stream.of(vmargs).noneMatch(arg -> arg.startsWith("-D" + PROP_LOG_INCLUDE_COMMAND_LINE))) {
             // Disable logging of command line by default if it's not explicitly set
             vmargs = Arrays.copyOf(vmargs, vmargs.length + 1);
             vmargs[vmargs.length - 1] = "-D" + PROP_LOG_INCLUDE_COMMAND_LINE + "=false";

Original file line number	Diff line number	Diff line change
`@@ -2701,7 +2701,7 @@ private void mergeWithSystemProperties(Properties source, Properties userConfigu`
`2701`	`2701`	`}`
`2702`	`2702`
`2703`	`2703`	`private void setupVMProperties() {`
`2704`		`- if (Stream.of(vmargs).noneMatch(arg -> arg.startsWith("-D" + PROP_LOG_INCLUDE_COMMAND_LINE))) {`
	`2704`	`+ if (vmargs != null && Stream.of(vmargs).noneMatch(arg -> arg.startsWith("-D" + PROP_LOG_INCLUDE_COMMAND_LINE))) {`
`2705`	`2705`	`// Disable logging of command line by default if it's not explicitly set`
`2706`	`2706`	`vmargs = Arrays.copyOf(vmargs, vmargs.length + 1);`
`2707`	`2707`	`vmargs[vmargs.length - 1] = "-D" + PROP_LOG_INCLUDE_COMMAND_LINE + "=false";`