adding null check in KillProcess task (#54)

aspnet · Sep 4, 2018 · 1de1b31 · 1de1b31
1 parent fbd1ca3
commit 1de1b31
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/...ers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props b/...ers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
@@ -62,21 +62,27 @@
                         using(var results = searcher.Get())
                           {
                             var mo = results.Cast<ManagementObject>().FirstOrDefault();
-                            Log.LogMessage("ExecutablePath is {0}", (string)mo["ExecutablePath"]);
-                            if(mo != null && ((string)mo["ExecutablePath"]).StartsWith(ImagePath, StringComparison.OrdinalIgnoreCase))
+                            if(mo != null)
                             {
-                              p.Kill();
-                              p.WaitForExit();
-                              Log.LogMessage("{0} is killed", (string)mo["ExecutablePath"]);
-                              break;
+                              var path = (string)mo["ExecutablePath"];
+                              var executablePath = path != null ? path : string.Empty;
+                              Log.LogMessage("ExecutablePath is {0}", executablePath);
+
+                              if(executablePath.StartsWith(ImagePath, StringComparison.OrdinalIgnoreCase))
+                              {
+                                p.Kill();
+                                p.WaitForExit();
+                                Log.LogMessage("{0} is killed", executablePath);
+                                break;
+                              }
                             }
                           }
                       }
                   }
                 }
                 catch (Exception ex)
                 {
-                  Log.LogErrorFromException(ex);
+                  Log.LogWarning(ex.Message);
                 }
                 return true;
                 ]]>