Fix getJavaVersion not work issue (#4624)

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/functions/localrun/FunctionRunState.java

@@ -201,7 +201,8 @@ private ComparableVersion getJavaVersion() throws IOException {
         final File javaFile = StringUtils.isEmpty(javaHome) ? null : Paths.get(javaHome, "bin", "java").toFile();
         final File executeFolder = javaFile == null ? null : javaFile.getParentFile();
         final String command = javaFile == null ? "java" : javaFile.getAbsolutePath();
-        final String javaVersion = CommandUtils.executeCommandAndGetOutput(command, new String[]{"-version"}, executeFolder);
+        final String javaVersion = CommandUtils.executeCommandAndGetOutput(command, new String[]{"-version"},
+                                                                           executeFolder, true);
         if (StringUtils.isEmpty(javaVersion)) {
             return null;
         }

Utils/azuretools-core/src/com/microsoft/azuretools/utils/CommandUtils.java

@@ -87,9 +87,14 @@ public static String exec(final String commandWithArgs) throws IOException {
     }
 
     public static String executeCommandAndGetOutput(final String commandWithoutArgs, final String[] args, final File directory) throws IOException {
+        return executeCommandAndGetOutput(commandWithoutArgs, args, directory, false);
+    }
+
+    public static String executeCommandAndGetOutput(final String commandWithoutArgs, final String[] args, final File directory,
+                                                    final boolean mergeErrorStream) throws IOException {
         final CommandLine commandLine = new CommandLine(commandWithoutArgs);
         commandLine.addArguments(args);
-        return executeCommandAndGetOutput(commandLine, directory);
+        return executeCommandAndGetOutput(commandLine, directory, mergeErrorStream);
     }
 
     public static String executeCommandAndGetOutput(final String starter, final String switcher, final String commandWithArgs,
@@ -101,16 +106,22 @@ public static String executeCommandAndGetOutput(final String starter, final Stri
     }
 
     public static String executeCommandAndGetOutput(final CommandLine commandLine, final File directory) throws IOException {
+        return executeCommandAndGetOutput(commandLine, directory, false);
+    }
+
+    public static String executeCommandAndGetOutput(final CommandLine commandLine, final File directory, final boolean mergeErrorStream) throws IOException {
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
-        final ByteArrayOutputStream err = new ByteArrayOutputStream();
+        final ByteArrayOutputStream err = mergeErrorStream ? out : new ByteArrayOutputStream();
         final PumpStreamHandler streamHandler = new PumpStreamHandler(out, err);
         final DefaultExecutor executor = new DefaultExecutor();
         executor.setWorkingDirectory(directory);
         executor.setStreamHandler(streamHandler);
         executor.setExitValues(null);
         try {
             executor.execute(commandLine);
-            logger.log(Level.SEVERE, err.toString());
+            if (!mergeErrorStream) {
+                logger.log(Level.SEVERE, err.toString());
+            }
             return out.toString();
         } catch (ExecuteException e) {
             // swallow execute exception and return empty