You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2016/11/11 19:14:32 UTC
svn commit: r1769329 -
/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
Author: pderop
Date: Fri Nov 11 19:14:32 2016
New Revision: 1769329
URL: http://svn.apache.org/viewvc?rev=1769329&view=rev
Log:
FELIX-5337: Reverted the patch to the previous version because it breaks the contract of the ServiceDepednency.setService(Class serviceName, String filter) method.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java?rev=1769329&r1=1769328&r2=1769329&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java Fri Nov 11 19:14:32 2016
@@ -395,12 +395,7 @@ public class ServiceDependencyImpl exten
m_trackedServiceFilter = serviceFilter;
}
else {
- // Don't include objectclass in the filter, it it is already present.
- if (serviceFilter.contains(Constants.OBJECTCLASS)) {
- m_trackedServiceFilter = serviceFilter;
- } else {
- m_trackedServiceFilter = "(&(" + Constants.OBJECTCLASS + "=" + serviceName.getName() + ")" + serviceFilter + ")";
- }
+ m_trackedServiceFilter = "(&(" + Constants.OBJECTCLASS + "=" + serviceName.getName() + ")" + serviceFilter + ")";
}
}
else {