[teiid-commits] teiid SVN: r856 - trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime.
Author: rareddy
Date: 2009-05-01 20:13:45 -0400 (Fri, 01 May 2009)
New Revision: 856
Modified:
trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java
Log:
TEIID-544
Modified:
trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java
===================================================================
---
trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java 2009-05-01
14:40:05 UTC (rev 855)
+++
trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java 2009-05-02
00:13:45 UTC (rev 856)
@@ -156,11 +156,12 @@
if ( obj instanceof ServiceData ) {
ServiceData that = (ServiceData) obj;
- return
(this.serviceID.getHostName().equals(that.getServiceID().getHostName()) &&
- this.serviceID.getProcessName().equals(that.serviceID.getProcessName())
&&
- this.getComponentDefnID().equals(that.getComponentDefnID()));
-//eployedComponent.equals(that.getDeployedComponent());
-// return defnID.equals(that.getComponentDefnID());
+
+ if (this.getComponentDefnID().equals(that.getComponentDefnID())) {
+ if (this.serviceID != null && that.serviceID != null) {
+ return (this.serviceID.equals(that.getServiceID()));
+ }
+ }
}
// Otherwise not comparable ...