svn commit: r945255 - /tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java

[rfeng]

Author: rfeng
Date: Mon May 17 17:25:31 2010
New Revision: 945255

URL: http://svn.apache.org/viewvc?rev=945255&view=rev
Log:
Make sure we use the value element (holding the property value) for conversion

Modified:
    
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java?rev=945255&r1=945254&r2=945255&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
 Mon May 17 17:25:31 2010
@@ -26,7 +26,6 @@ import java.net.URLConnection;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Source;
@@ -89,7 +88,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * @version $Rev$ $Date$
@@ -695,7 +693,8 @@ public class ComponentBuilderImpl {
                 // The property has a simple schema type so we can use the 
                 // data binding framework to see if the XML value can be 
transformed 
                 // into a simple Java value
-                Document source = (Document)componentProperty.getValue();
+                Document doc = (Document)componentProperty.getValue();
+                Node source = (doc == null) ? null : 
doc.getDocumentElement().getFirstChild();
                 DataType<XMLType> sourceDataType = new 
DataTypeImpl<XMLType>(DOMDataBinding.NAME, 
                                                                              
Node.class,
                                                                              
new XMLType(null, componentProperty.getXSDType()));