Be more precise when testing whether a property has had a value set and update the property reading code so that empty text values are not generated as a matter of course.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@805004 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 4 deletions

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index dbce9d2d8d..32ea875e90 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
@@ -602,11 +602,14 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
                 case END_ELEMENT:
                     name = reader.getName();
                     if (PROPERTY_QNAME.equals(name)) {
+                        
                         if (root.getChildNodes().getLength() == 0) {
-                            // Add the text as an <value>
-                            Element valueElement = document.createElementNS(SCA11_NS, VALUE);
-                            root.appendChild(valueElement);
-                            valueElement.setTextContent(text.toString());
+                            // Add an text as an <value>
+                            if (isTextForProperty){
+                                Element valueElement = document.createElementNS(SCA11_NS, VALUE);
+                                root.appendChild(valueElement);
+                                valueElement.setTextContent(text.toString());
+                            }
                         }
                         return document;
                     }