This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new bb4ad6c Ensuring the correct address is used when connecting to
debugger, instead of hardcoding InetAddress.getLocalHost().getHostName().
bb4ad6c is described below
commit bb4ad6c2c1641f320c526816682042d6a493fe85
Author: Jan Lahoda <jlah...@netbeans.org>
AuthorDate: Sat Aug 17 17:35:49 2019 +0200
Ensuring the correct address is used when connecting to debugger, instead
of hardcoding InetAddress.getLocalHost().getHostName().
---
.../modules/java/openjdk/jtreg/ActionProviderImpl.java | 5 +++--
.../org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java | 11 +++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
index a288455..7d5767b 100644
---
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
+++
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
@@ -76,6 +76,7 @@ import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.NbBundle.Messages;
+import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.Lookups;
import org.openide.util.lookup.ServiceProvider;
@@ -255,8 +256,8 @@ public class ActionProviderImpl implements ActionProvider {
JPDAStart s = new JPDAStart(io,
COMMAND_DEBUG_SINGLE); //XXX command
s.setAdditionalSourcePath(fullSourcePath);
try {
- int connectTo = s.execute(prj);
- Socket clientSocket = new
Socket(InetAddress.getLocalHost(), connectTo);
+ Pair<String, Integer>
connectTo = s.execute(prj);
+ Socket clientSocket = new
Socket(connectTo.first() != null ? connectTo.first() :
InetAddress.getLocalHost().getHostName(), connectTo.second());
BACKGROUND.post(new
Copy(clientSocket.getInputStream(), server.getOutputStream(), clientSocket));
BACKGROUND.post(new
Copy(server.getInputStream(), clientSocket.getOutputStream(), clientSocket));
} catch (Throwable ex) {
diff --git
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
index 9cdba00..f488aeb 100644
---
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
+++
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
@@ -40,6 +40,7 @@ import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.project.Project;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileUtil;
+import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.windows.InputOutput;
@@ -66,7 +67,7 @@ public class JPDAStart implements Runnable {
private ClassPath additionalSourcePath;
- private final Object[] lock = new Object[2];
+ private final Object[] lock = new Object[3];
private Project project;
private final String actionName;
@@ -80,7 +81,7 @@ public class JPDAStart implements Runnable {
/**
* returns the port/address that the debugger listens to..
*/
- public int execute(Project project) throws Throwable {
+ public Pair<String, Integer> execute(Project project) throws Throwable {
this.project = project;
io.getOut().println("NetBeans: JPDA Listening Start..."); //NOI18N
// getLog().debug("Entering synch lock"); //NOI18N
@@ -94,7 +95,7 @@ public class JPDAStart implements Runnable {
throw ((Throwable) lock[1]); //NOI18N
}
}
- return (Integer)lock[0];
+ return Pair.of((String) lock[2], (Integer)lock[0]);
}
@Override
@@ -123,11 +124,13 @@ public class JPDAStart implements Runnable {
final Map args = lc.defaultArguments();
String address = lc.startListening(args);
// try {
- int port =
Integer.parseInt(address.substring(address.indexOf(':') + 1));
+ int colon = address.indexOf(':');
+ int port = Integer.parseInt(address.substring(colon + 1));
// getProject ().setNewProperty (getAddressProperty (),
"localhost:" + port);
Connector.IntegerArgument portArg =
(Connector.IntegerArgument) args.get("port"); //NOI18N
portArg.setValue(port);
lock[0] = port;
+ lock[2] = colon != (-1) ? address.substring(0, colon) :
null;
// } catch (NumberFormatException e) {
// this address format is not known, use default
// getProject ().setNewProperty (getAddressProperty (),
address);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
