svn commit: r1496543 - /felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/TransformedServiceReferenceImpl.java

[cl...@apache.org]

Author: clement
Date: Tue Jun 25 17:15:42 2013
New Revision: 1496543

URL: http://svn.apache.org/r1496543
Log:
Fix FELIX-4132 @Modified not working on Equinox

The equals method from the TransformedServiceReferenceImpl was wrongly thinking that service.id was a long value (and not a Long object).

Modified:
    felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/TransformedServiceReferenceImpl.java

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/TransformedServiceReferenceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/TransformedServiceReferenceImpl.java?rev=1496543&r1=1496542&r2=1496543&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/TransformedServiceReferenceImpl.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/TransformedServiceReferenceImpl.java Tue Jun 25 17:15:42 2013
@@ -153,7 +153,7 @@ public class TransformedServiceReference
         if (o instanceof ServiceReference) {
             Object id1 = ((ServiceReference) o).getProperty(Constants.SERVICE_ID);
             Object id2 = this.getProperty(Constants.SERVICE_ID);
-            return id1 == id2;
+            return (id1 != null && id1.equals(id2)) || (id1 == id2);
         }
         return m_origin.equals(o);
     }