Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2015-06-17 11:18:11 -0400
committerUwe Stieber2015-06-17 11:19:07 -0400
commit0b20c451de6dbd7bd6e4cd99ce057850bc3cb982 (patch)
tree1390e268aa2426814d725e7326105b7fdffffb4b
parent5bacb286c7e61ef57cf1af691a2f84be0464760d (diff)
downloadorg.eclipse.tcf-0b20c451de6dbd7bd6e4cd99ce057850bc3cb982.tar.gz
org.eclipse.tcf-0b20c451de6dbd7bd6e4cd99ce057850bc3cb982.tar.xz
org.eclipse.tcf-0b20c451de6dbd7bd6e4cd99ce057850bc3cb982.zip
Target Explorer: Fix an NPE launching the gdbserver and the address is already in use
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
index 1ac877998..c05e05549 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
@@ -215,7 +215,7 @@ public abstract class TEGdbAbstractLaunchDelegate extends GdbLaunchDelegate {
if (gdbServerOutput.toString().contains("Address already in use.")) { //$NON-NLS-1$
// If we have still alternatives, then retry the gdbserver launch
// with an alternative port
- if (!gdbserverPortNumberAlternatives.isEmpty()) {
+ if (gdbserverPortNumberAlternatives != null && !gdbserverPortNumberAlternatives.isEmpty()) {
String newPort = null;
String newPortMappedTo = null;

Back to the top