reducing code duplication, reorganize try/catch block in getProcessId

Author: lukeis

java/client/src/org/openqa/selenium/os/ProcessUtils.java

@@ -125,16 +125,7 @@ private static int killWinProcess(Process process) {
     int exitValue;
 
     try {
-      Field f = process.getClass().getDeclaredField("handle");
-      f.setAccessible(true);
-      long hndl = f.getLong(process);
-
-      Kernel32 kernel = Kernel32.INSTANCE;
-      WinNT.HANDLE handle = new WinNT.HANDLE();
-      handle.setPointer(Pointer.createConstant(hndl));
-      int pid = kernel.GetProcessId(handle);
-
-      killPID("" + pid);
+      killPID("" + getProcessId(process));
       exitValue = waitForProcessDeath(process, 10000);
     } catch (Exception ex) {
       LOG.log(Level.WARNING, "Process refused to die after 10 seconds, and couldn't taskkill it", ex);
@@ -184,28 +175,24 @@ private static void closeAllStreamsAndDestroyProcess(Process process) {
   }
 
   static int getProcessId(Process p) {
-    if (thisIsWindows()) {
-      try {
+    try {
+      if (Platform.getCurrent().is(WINDOWS)) {
         Field f = p.getClass().getDeclaredField("handle");
         f.setAccessible(true);
         long hndl = f.getLong(p);
 
         Kernel32 kernel = Kernel32.INSTANCE;
         WinNT.HANDLE handle = new WinNT.HANDLE();
         handle.setPointer(Pointer.createConstant(hndl));
-        int pid = kernel.GetProcessId(handle);
-        return pid;
-      } catch (Exception e) {
-        throw new RuntimeException("Couldn't detect pid", e);
-      }
-    } else {
-      try {
-        Field f = p.getClass().getDeclaredField("pid");
-        f.setAccessible(true);
-        return (Integer) f.get(p);
-      } catch (Exception e) {
-        throw new RuntimeException("Couldn't detect pid", e);
+        return kernel.GetProcessId(handle);
       }
+
+      Field f = p.getClass().getDeclaredField("pid");
+      f.setAccessible(true);
+      return (Integer) f.get(p);
+
+    } catch (Exception e) {
+      throw new RuntimeException("Couldn't detect pid", e);
     }
   }