You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/04/18 20:01:20 UTC
svn commit: r649631 - in
/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo:
helper/XMLStreamHelperImpl.java util/resource/DataObjectXMLStreamReader.java
Author: rfeng
Date: Fri Apr 18 11:01:17 2008
New Revision: 649631
URL: http://svn.apache.org/viewvc?rev=649631&view=rev
Log:
Add null checks
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java?rev=649631&r1=649630&r2=649631&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java Fri Apr 18 11:01:17 2008
@@ -19,11 +19,8 @@
*/
package org.apache.tuscany.sdo.helper;
-import java.io.IOException;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
-import javax.xml.namespace.QName;
+
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -32,7 +29,6 @@
import org.apache.tuscany.sdo.util.resource.DataObjectXMLStreamReader;
import org.apache.tuscany.sdo.util.resource.XMLDocumentStreamReader;
import org.apache.tuscany.sdo.util.resource.XMLStreamSerializer;
-//import org.apache.tuscany.sdo.api.XMLStreamHelper;
import org.eclipse.emf.ecore.resource.Resource;
import commonj.sdo.DataObject;
@@ -114,6 +110,9 @@
}
public XMLStreamReader createXMLStreamReader(DataObject dataObject) {
+ if (dataObject == null) {
+ return null;
+ }
String rootElementURI;
String rootElementName;
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java?rev=649631&r1=649630&r2=649631&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java Fri Apr 18 11:01:17 2008
@@ -273,6 +273,9 @@
List elementList = new ArrayList();
List attributeList = new ArrayList();
+ if (dataObject == null) {
+ return;
+ }
Type type = dataObject.getType();
// Add xsi:type if rootElement doesn't exist or the type is different
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org