Author: rfeng
Date: Fri Apr 11 10:58:06 2008
New Revision: 647246
URL: http://svn.apache.org/viewvc?rev=647246&view=rev
Log:
Apply the patch from Scott for TUSCANY-2217. Thanks.
Modified:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
Modified:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java?rev=647246&r1=647245&r2=647246&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
Fri Apr 11 10:58:06 2008
@@ -50,9 +50,11 @@
@SuppressWarnings("unchecked")
public Object mediate(Object source, DataType sourceDataType, DataType
targetDataType, Map<String, Object> metadata) {
if (sourceDataType == null || sourceDataType.getDataBinding() == null)
{
- sourceDataType = dataBindings.introspectType(source);
+ if (source != null) {
+ sourceDataType = dataBindings.introspectType(source);
+ }
}
- if (sourceDataType == null) {
+ if (sourceDataType == null || targetDataType == null) {
return source;
} else if (sourceDataType.equals(targetDataType)) {
return source;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
