Author: rfeng
Date: Mon Nov 5 12:17:43 2007
New Revision: 592139
URL: http://svn.apache.org/viewvc?rev=592139&view=rev
Log:
Apply the patch for TUSCANY-1681 from Scott. Thanks.
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
Mon Nov 5 12:17:43 2007
@@ -38,6 +38,9 @@
PullTransformer<DataObject, Node> {
public Node transform(DataObject source, TransformationContext context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
Mon Nov 5 12:17:43 2007
@@ -33,6 +33,9 @@
PullTransformer<DataObject, String> {
public String transform(DataObject source, TransformationContext context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
Mon Nov 5 12:17:43 2007
@@ -38,6 +38,9 @@
PullTransformer<DataObject, XMLStreamReader> {
public XMLStreamReader transform(DataObject source, TransformationContext
context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper =
SDOUtil.createXMLStreamHelper(helperContext);
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
Mon Nov 5 12:17:43 2007
@@ -36,6 +36,9 @@
public class Node2DataObject extends BaseTransformer<Node, DataObject>
implements PullTransformer<Node, DataObject> {
public DataObject transform(Node source, TransformationContext context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
Mon Nov 5 12:17:43 2007
@@ -31,6 +31,9 @@
PullTransformer<String, DataObject> {
public DataObject transform(String source, TransformationContext context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
Mon Nov 5 12:17:43 2007
@@ -33,6 +33,9 @@
PullTransformer<XMLDocument, String> {
public String transform(XMLDocument source, TransformationContext context)
{
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
Mon Nov 5 12:17:43 2007
@@ -39,6 +39,9 @@
* @return
*/
public XMLStreamReader transform(XMLDocument source, TransformationContext
context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper =
SDOUtil.createXMLStreamHelper(helperContext);
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
Mon Nov 5 12:17:43 2007
@@ -35,6 +35,9 @@
PullTransformer<XMLStreamReader, DataObject> {
public DataObject transform(XMLStreamReader source, TransformationContext
context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper =
SDOUtil.createXMLStreamHelper(helperContext);
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java?rev=592139&r1=592138&r2=592139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
Mon Nov 5 12:17:43 2007
@@ -34,6 +34,9 @@
PullTransformer<XMLStreamReader, XMLDocument> {
public XMLDocument transform(XMLStreamReader source, TransformationContext
context) {
+ if (source == null) {
+ return null;
+ }
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper =
SDOUtil.createXMLStreamHelper(helperContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
