Author: uiterlix
Date: Tue Apr  3 14:29:35 2012
New Revision: 1308937

URL: http://svn.apache.org/viewvc?rev=1308937&view=rev
Log:
FELIX-3423: Prevented the copy of the DependencyManager.ASPECT service property 
to the adapter's service properties.

Modified:
    
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java

Modified: 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java?rev=1308937&r1=1308936&r2=1308937&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
 (original)
+++ 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
 Tue Apr  3 14:29:35 2012
@@ -94,7 +94,7 @@ public class AdapterServiceImpl extends 
                        // if we're handed an aspect fetch the aspect property 
as the service id to track, but do not copy it
                        serviceIdToTrack = ref.getProperty(key).toString();
                 }
-                if (key.equals(Constants.SERVICE_ID) || 
key.equals(Constants.SERVICE_RANKING) || key.equals(Constants.OBJECTCLASS)) {
+                if (key.equals(DependencyManager.ASPECT) || 
key.equals(Constants.SERVICE_ID) || key.equals(Constants.SERVICE_RANKING) || 
key.equals(Constants.OBJECTCLASS)) {
                     // do not copy these either
                 }
                 else {


Reply via email to