Author: clement
Date: Thu Sep 27 06:28:36 2007
New Revision: 580009
URL: http://svn.apache.org/viewvc?rev=580009&view=rev
Log:
Fix a bug in the Dependency Handler Description when the "instance.name"
property is not set.
Modified:
felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
Modified:
felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java?rev=580009&r1=580008&r2=580009&view=diff
==============================================================================
---
felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
(original)
+++
felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
Thu Sep 27 06:28:36 2007
@@ -25,6 +25,7 @@
import org.apache.felix.ipojo.architecture.HandlerDescription;
import org.apache.felix.ipojo.metadata.Attribute;
import org.apache.felix.ipojo.metadata.Element;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
/**
@@ -112,7 +113,7 @@
while (it.hasNext()) {
Element use = new Element("Uses", "");
ServiceReference ref = (ServiceReference) it.next();
- use.addAttribute(new Attribute("instance.name",
ref.getProperty("instance.name").toString()));
+ use.addAttribute(new Attribute("service.id",
ref.getProperty(Constants.SERVICE_ID).toString()));
String in = (String) ref.getProperty("instance.name");
if (in != null) {
use.addAttribute(new Attribute("instance.name", in));