Author: rfeng
Date: Fri Aug 24 12:59:24 2007
New Revision: 569498
URL: http://svn.apache.org/viewvc?rev=569498&view=rev
Log:
Fix for TUSCANY-1582
Modified:
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
Modified:
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java?rev=569498&r1=569497&r2=569498&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
(original)
+++
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
Fri Aug 24 12:59:24 2007
@@ -23,6 +23,7 @@
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
+import org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
@@ -45,6 +46,11 @@
public boolean introspect(DataType type, Annotation[] annotations) {
Class<?> cls = type.getPhysical();
if (cls == Object.class) {
+ return false;
+ }
+ // HACK: [rfeng] By pass the one know to XMLString
+ String db = type.getDataBinding();
+ if (db != null && (XMLStringDataBinding.NAME.equals(db) ||
XMLStringDataBinding.ALIASES[0].equals(db))) {
return false;
}
if (SimpleTypeMapperImpl.JAVA2XML.keySet().contains(cls)) {
Modified:
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java?rev=569498&r1=569497&r2=569498&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
(original)
+++
incubator/tuscany/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
Fri Aug 24 12:59:24 2007
@@ -40,7 +40,7 @@
@Override
public boolean introspect(DataType type, Annotation[] annotations) {
- if (NAME.equals(type.getDataBinding()) ||
ALIASES[0].equals(type.getDataBinding())) {
+ if (type.getPhysical() == String.class &&
NAME.equals(type.getDataBinding()) || ALIASES[0].equals(type.getDataBinding()))
{
type.setDataBinding(NAME);
type.setLogical(XMLType.UNKNOWN);
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
