diff options
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.runtime.services')
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java index c1edcaed9..8cdf00fd9 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java @@ -263,7 +263,7 @@ public abstract class AbstractServiceManager { @Override public boolean equals(Object obj) { if (obj instanceof ServiceProxy) { - return id.equals(((ServiceProxy)obj).id); + return id != null ? id.equals(((ServiceProxy)obj).id) : ((ServiceProxy)obj).id == null; } return super.equals(obj); } @@ -273,7 +273,7 @@ public abstract class AbstractServiceManager { */ @Override public int hashCode() { - return id.hashCode(); + return id != null ? id.hashCode() : super.hashCode(); } public boolean equals(IService service) { |