From 60f5bce98ed1ce21b111c0d006d2dfd02106371b Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 20 Jan 2010 06:20:53 +0000
Subject: Update to the latest version of OSGi Remote Service Admin Fix the
 issues to pass OSGi SCA configuration type TCK

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@901079 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca/implementation/osgi/xml/OSGiPropertyProcessor.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java')

diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java b/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
index 84734b88db..a0c9baf6f1 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
@@ -94,11 +94,15 @@ public class OSGiPropertyProcessor implements StAXArtifactProcessor<OSGiProperty
     }
 
     public void write(OSGiProperty model, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
-        writer.writeStartElement(PROPERTY_QNAME.getNamespaceURI(), PROPERTY_QNAME.getLocalPart());
-        writer.writeAttribute(NAME, model.getName());
-        writer.writeAttribute(TYPE, model.getType());
-        writer.writeCharacters(model.getStringValue());
-        writer.writeEndElement();
+        if (model.getStringValue() != null) {
+            writer.writeStartElement(PROPERTY_QNAME.getNamespaceURI(), PROPERTY_QNAME.getLocalPart());
+            writer.writeAttribute(NAME, model.getName());
+            if (model.getType() != null) {
+                writer.writeAttribute(TYPE, model.getType());
+            }
+            writer.writeAttribute(VALUE, model.getStringValue());
+            writer.writeEndElement();
+        }
     }
 
     public Class<OSGiProperty> getModelType() {
-- 
cgit v1.2.3