Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2014-10-30 09:33:17 +0000
committerTobias Schwarz2014-10-30 09:33:17 +0000
commit727128e24818e3e97295ebaaf403911eb58082d9 (patch)
tree9bfae34002f0f931dea9482612bbffd4bc376bdd
parent63c8b9f552eb922f2936aa2de6fb5e4c7c5edff2 (diff)
downloadorg.eclipse.tcf-727128e24818e3e97295ebaaf403911eb58082d9.tar.gz
org.eclipse.tcf-727128e24818e3e97295ebaaf403911eb58082d9.tar.xz
org.eclipse.tcf-727128e24818e3e97295ebaaf403911eb58082d9.zip
SM: fix NPE
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/SimulatorPropertyTester.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/SimulatorPropertyTester.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/SimulatorPropertyTester.java
index 6b90e79b0..37141117c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/SimulatorPropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/SimulatorPropertyTester.java
@@ -30,7 +30,7 @@ public class SimulatorPropertyTester extends org.eclipse.core.expressions.Proper
final IPeerNode peerNode = (IPeerNode) receiver;
Result result = SimulatorUtils.getSimulatorService(peerNode);
- if (result.service != null) {
+ if (result != null && result.service != null) {
if ("isSimulatorState".equals(property) && expectedValue instanceof String) { //$NON-NLS-1$
State state = result.service.getState(receiver, result.settings);
return state.toString().equalsIgnoreCase((String) expectedValue);

Back to the top