Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2018-08-22 09:43:42 -0400
committerJeff Johnston2018-08-22 12:31:22 -0400
commit6fdd91938e3e597df978b37ec8e980bb28d7952e (patch)
tree409dcca60ebeb82ea44edf5e884afc744a99715a
parente9b3909276ff8f887f70460dfa9058b0f579b2f7 (diff)
downloadorg.eclipse.linuxtools-6fdd91938e3e597df978b37ec8e980bb28d7952e.tar.gz
org.eclipse.linuxtools-6fdd91938e3e597df978b37ec8e980bb28d7952e.tar.xz
org.eclipse.linuxtools-6fdd91938e3e597df978b37ec8e980bb28d7952e.zip
Bug 538156 - Handle 'address' argument for Java 1.8 and 9 correctly.
Change-Id: If00021194f65330a280d5fd5375d2a399ffdc11e Reviewed-on: https://git.eclipse.org/r/127857 Tested-by: CI Bot Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> (cherry picked from commit b95a97e2f1b2c6a4ba55472c79d7446b4930407e) Reviewed-on: https://git.eclipse.org/r/127860
-rw-r--r--containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/JavaAppInContainerLaunchDelegate.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/JavaAppInContainerLaunchDelegate.java b/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/JavaAppInContainerLaunchDelegate.java
index 30a16d5e25..740bb9cc7d 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/JavaAppInContainerLaunchDelegate.java
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/JavaAppInContainerLaunchDelegate.java
@@ -180,6 +180,8 @@ public class JavaAppInContainerLaunchDelegate extends AbstractJavaLaunchConfigur
}
if (version < 1.5) {
finalVMArgs.add("-Xrunjdwp:transport=dt_socket,server=y,address=" + port); //$NON-NLS-1$
+ } else if (version < 9) {
+ finalVMArgs.add("-agentlib:jdwp=transport=dt_socket,server=y,address=" + port); //$NON-NLS-1$
} else {
finalVMArgs.add("-agentlib:jdwp=transport=dt_socket,server=y,address=*:" + port); //$NON-NLS-1$
}

Back to the top