Applied patch (FELIX-214) to fix a bug that was not updating the
component type model properly.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@506476 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java b/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
index 51e92e2..1b98ea6 100644
--- a/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
+++ b/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
@@ -71,7 +71,7 @@
*/
public String toString() {
if (m_value != null) { return getName() + " - " + getType() + " - " + getValue(); }
- else { return getName() + " - " + getType() + " - CONFIGURABLE"; }
+ else { return getName() + " - " + getType() + " - REQUIRED"; }
}
}
diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java b/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
index cdec550..557e164 100644
--- a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
+++ b/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
@@ -125,7 +125,7 @@
ConfigurableProperty cp = new ConfigurableProperty(name, fieldName, value, type, this);
if (cp.getValue() != null) { cd.addProperty(new PropertyDescription(name, type, cp.getValue().toString())); }
- else { cd.addProperty(new PropertyDescription(name, type, "")); }
+ else { cd.addProperty(new PropertyDescription(name, type, null)); }
addProperty(cp);
}