In CommandUtils.java, don't output error message when not needed (#460)

* Rider may hang on loading screen due to exception #459 * Update platformPlugin.xml
JetBrains · Mar 22, 2021 · e81f829 · e81f829
1 parent 562ea3a
commit e81f829
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -6,7 +6,7 @@
     <html>
       <h4>Bug fix:</h4>
       <ul>
-        <li>Fix Azure Toolkit for Rider: Deployment Slot setting is not saved (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/423">#423</a>)</li>
+        <li>Don't output error message when not needed (<a href="https://github.com/JetBrains/azure-tools-for-intellij/pull/461">#461</a>)</li>
       </ul>
     </html>
     ]]>

diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/utils/CommandUtils.java b/Utils/azuretools-core/src/com/microsoft/azuretools/utils/CommandUtils.java
@@ -120,7 +120,7 @@ public static String executeCommandAndGetOutput(final CommandLine commandLine, f
         executor.setExitValues(null);
         try {
             executor.execute(commandLine);
-            if (!mergeErrorStream) {
+            if (!mergeErrorStream && err.size() > 0) {
                 logger.log(Level.SEVERE, err.toString());
             }
             return out.toString();
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
         <html>
           <h4>Bug fix:</h4>
           <ul>
-            <li>Fix Azure Toolkit for Rider: Deployment Slot setting is not saved (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/423">#423</a>)</li>
+            <li>Don't output error message when not needed (<a href="https://github.com/JetBrains/azure-tools-for-intellij/pull/461">#461</a>)</li>
           </ul>
         </html>
         ]]>
@@ Expand Down @@