summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 20:23:35 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 20:23:35 +0000
commite0f7d1e48167a61f45d0186e2684da12814ad7cb (patch)
tree1c729716eb5a9841ecd2c850f835234455b41436 /branches/sca-java-1.3/modules/databinding-jaxb/src/main/java
parent2aa685b8d6e2df02422b9abd98622276a88e2cf6 (diff)
Merge the changes from trunk for TUSCANY-2465
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@674938 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3/modules/databinding-jaxb/src/main/java')
-rw-r--r--branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 471bb54bbd..eebb4b2e37 100644
--- a/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
@@ -125,8 +125,8 @@ public class JAXBDataBinding extends BaseDataBinding {
@Override
public XMLTypeHelper getXMLTypeHelper() {
- return new JAXBTypeHelper();
- // return xmlTypeHelper;
+ // return new JAXBTypeHelper();
+ return xmlTypeHelper;
}
}