Merge pull request #38 from jGauravGupta/FISH-654

FISH-654 Release Eclipse tools v1.3.0
payara · Nov 19, 2020 · 2826c7f · 2826c7f
2 parents 32ca878 + 46bc5e5
commit 2826c7f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/features/org.eclipse.payara.tools.everything/feature.xml b/features/org.eclipse.payara.tools.everything/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.payara.tools.everything" label="Payara Tools Build Wrapper" provider-name="Eclipse.org - Payara Tools" version="1.2.0.qualifier">
+<feature id="org.eclipse.payara.tools.everything" label="Payara Tools Build Wrapper" provider-name="Eclipse.org - Payara Tools" version="1.3.0.qualifier">
 
    <includes id="org.eclipse.payara.tools" version="0.0.0"/>
    <includes id="org.eclipse.payara.tools.source" version="0.0.0"/>

diff --git a/features/org.eclipse.payara.tools.source/feature.xml b/features/org.eclipse.payara.tools.source/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.payara.tools.source" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
+<feature id="org.eclipse.payara.tools.source" label="%featureName" provider-name="%providerName" version="1.3.0.qualifier">
 
    <description>
       %featureDescription

diff --git a/features/org.eclipse.payara.tools/feature.xml b/features/org.eclipse.payara.tools/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.payara.tools"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.payara.tools">
 

diff --git a/plugins/org.eclipse.payara.tools.jver/META-INF/MANIFEST.MF b/plugins/org.eclipse.payara.tools.jver/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-Vendor: %BundleVendor
 Bundle-SymbolicName: org.eclipse.payara.tools.jver
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Localization: bundle
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.payara.tools.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.payara.tools.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.payara.tools.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin

diff --git a/plugins/org.eclipse.payara.tools/META-INF/MANIFEST.MF b/plugins/org.eclipse.payara.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.payara.tools;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.payara.tools.PayaraToolsPlugin
 Bundle-Vendor: %providerName

diff --git a/plugins/org.eclipse.payara.tools/src/org/eclipse/payara/tools/micro/MicroRuntimeProcess.java b/plugins/org.eclipse.payara.tools/src/org/eclipse/payara/tools/micro/MicroRuntimeProcess.java
@@ -11,6 +11,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Map;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.core.DebugException;
@@ -62,16 +63,23 @@ private void disconnectDebuggerConnection() throws DebugException {
     private void terminateInstance() {
         try {
             Process process = (Process) getSystemProcess();
-            Field field = process.getClass().getDeclaredField("handle");
-            field.setAccessible(true);
-            long handleValue = field.getLong(process);
-            Kernel32 kernel = Kernel32.INSTANCE;
-            WinNT.HANDLE handle = new WinNT.HANDLE();
-            handle.setPointer(Pointer.createConstant(handleValue));
-            int pid = kernel.GetProcessId(handle);
+            long pid;
+            try {
+                Method method = process.getClass().getDeclaredMethod("pid");
+                method.setAccessible(true);
+                pid = (long) method.invoke(process);
+            } catch (NoSuchMethodException ex) {
+                Field field = process.getClass().getDeclaredField("handle");
+                field.setAccessible(true);
+                long handleValue = field.getLong(process);
+                Kernel32 kernel = Kernel32.INSTANCE;
+                WinNT.HANDLE handle = new WinNT.HANDLE();
+                handle.setPointer(Pointer.createConstant(handleValue));
+                pid = kernel.GetProcessId(handle);
+            }
             killProcess(String.valueOf(pid));
         } catch (Exception ex) {
-        	LOG.log(Level.SEVERE, ERROR_MESSAGE, ex);
+            LOG.log(Level.SEVERE, ERROR_MESSAGE, ex);
         }
     }