You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2009/09/15 10:01:08 UTC
svn commit: r815200 -
/felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
Author: marrs
Date: Tue Sep 15 08:01:08 2009
New Revision: 815200
URL: http://svn.apache.org/viewvc?rev=815200&view=rev
Log:
FELIX-1546 implemented the patches for feature 3, shell command displaying service dependency filters
Modified:
felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
Modified: felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java?rev=815200&r1=815199&r2=815200&view=diff
==============================================================================
--- felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java (original)
+++ felix/trunk/dependencymanager/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java Tue Sep 15 08:01:08 2009
@@ -48,6 +48,7 @@
private volatile Class m_trackedServiceName;
private Object m_nullObject;
private volatile String m_trackedServiceFilter;
+ private volatile String m_trackedServiceFilterUnmodified;
private volatile ServiceReference m_trackedServiceReference;
private volatile boolean m_isStarted;
private Object m_callbackInstance;
@@ -531,9 +532,11 @@
}
m_trackedServiceName = serviceName;
if (serviceFilter != null) {
+ m_trackedServiceFilterUnmodified = serviceFilter;
m_trackedServiceFilter ="(&(" + Constants.OBJECTCLASS + "=" + serviceName.getName() + ")" + serviceFilter + ")";
}
else {
+ m_trackedServiceFilterUnmodified = null;
m_trackedServiceFilter = null;
}
m_trackedServiceReference = null;
@@ -557,6 +560,7 @@
}
m_trackedServiceName = serviceName;
m_trackedServiceReference = serviceReference;
+ m_trackedServiceFilterUnmodified = null;
m_trackedServiceFilter = null;
return this;
}
@@ -694,7 +698,7 @@
}
public synchronized String toString() {
- return "ServiceDependency[" + m_trackedServiceName + " " + m_trackedServiceFilter + "]";
+ return "ServiceDependency[" + m_trackedServiceName + " " + m_trackedServiceFilterUnmodified + "]";
}
public String getAutoConfigName() {
@@ -702,7 +706,12 @@
}
public String getName() {
- return m_trackedServiceName.getName();
+ StringBuilder sb = new StringBuilder();
+ sb.append(m_trackedServiceName.getName());
+ if (m_trackedServiceFilterUnmodified != null) {
+ sb.append(m_trackedServiceFilterUnmodified);
+ }
+ return sb.toString();
}
public int getState() {