From 07977503be69c5adecbb7ba727a371e39edf655f Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 15 Mar 2019 11:42:41 -0700
Subject: [PATCH 1/4] Kills java instances for Azure pipelines

---
 eng/scripts/KillProcesses.ps1 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eng/scripts/KillProcesses.ps1 b/eng/scripts/KillProcesses.ps1
index 27067859628c..f59cee0993ca 100644
--- a/eng/scripts/KillProcesses.ps1
+++ b/eng/scripts/KillProcesses.ps1
@@ -10,6 +10,12 @@ function _kill($processName) {
     }
 }
 
+function _killSeleniumJavaInstances(){
+    Get-Process java |
+        Where-Object { $_.Path -like "$env:JAVA_HOME*" } |
+        Stop-Process
+}
+
 _kill dotnet.exe
 _kill testhost.exe
 _kill iisexpress.exe
@@ -22,6 +28,8 @@ _kill vctip.exe
 _kill chrome.exe
 _kill h2spec.exe
 _kill WerFault.exe
+_killSeleniumJavaInstances
+
 if (Get-Command iisreset -ErrorAction ignore) {
     iisreset /restart
 }

From 10ea92cf6739849bff4709e06dae598f774c38f8 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 15 Mar 2019 14:20:38 -0700
Subject: [PATCH 2/4] Improved version

---
 eng/scripts/KillProcesses.ps1 | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/eng/scripts/KillProcesses.ps1 b/eng/scripts/KillProcesses.ps1
index f59cee0993ca..ca0fcf834db4 100644
--- a/eng/scripts/KillProcesses.ps1
+++ b/eng/scripts/KillProcesses.ps1
@@ -10,10 +10,16 @@ function _kill($processName) {
     }
 }
 
-function _killSeleniumJavaInstances(){
-    Get-Process java |
-        Where-Object { $_.Path -like "$env:JAVA_HOME*" } |
-        Stop-Process
+function _killJavaInstances() {
+    $_javaProcesses = Get-Process java -ErrorAction SilentlyContinue |
+        Where-Object { $_.Path -like "$env:JAVA_HOME*" };
+    foreach($_javaProcess in $_javaProcesses) {
+        try {
+            Stop-Process $proc
+        } catch {
+            Write-Output "Failed to kill java process: $proc 
+        }
+    }
 }
 
 _kill dotnet.exe
@@ -28,7 +34,7 @@ _kill vctip.exe
 _kill chrome.exe
 _kill h2spec.exe
 _kill WerFault.exe
-_killSeleniumJavaInstances
+_killJavaInstances
 
 if (Get-Command iisreset -ErrorAction ignore) {
     iisreset /restart

From c6234e05faeb7bc6c72dcfc062b188a5f4bfb542 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 15 Mar 2019 14:21:16 -0700
Subject: [PATCH 3/4] Update output

---
 eng/scripts/KillProcesses.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/scripts/KillProcesses.ps1 b/eng/scripts/KillProcesses.ps1
index ca0fcf834db4..6a84f3b7a0cd 100644
--- a/eng/scripts/KillProcesses.ps1
+++ b/eng/scripts/KillProcesses.ps1
@@ -17,7 +17,7 @@ function _killJavaInstances() {
         try {
             Stop-Process $proc
         } catch {
-            Write-Output "Failed to kill java process: $proc 
+            Write-Host "Failed to kill java process: $proc 
         }
     }
 }

From b7a179d3f864e2889d3b2912d10ca9f23a7afcc4 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 15 Mar 2019 16:25:04 -0700
Subject: [PATCH 4/4] Add missing quote

---
 eng/scripts/KillProcesses.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/scripts/KillProcesses.ps1 b/eng/scripts/KillProcesses.ps1
index 6a84f3b7a0cd..65f84df17eb7 100644
--- a/eng/scripts/KillProcesses.ps1
+++ b/eng/scripts/KillProcesses.ps1
@@ -17,7 +17,7 @@ function _killJavaInstances() {
         try {
             Stop-Process $proc
         } catch {
-            Write-Host "Failed to kill java process: $proc 
+            Write-Host "Failed to kill java process: $proc"
         }
     }
 }