summaryrefslogtreecommitdiffstats
path: root/java/sca
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 22:25:11 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 22:25:11 +0000
commit3b73bc882136ec063315bf8dc051b8e63ac48ad6 (patch)
tree373ddd0bdd8faf71d1cf6b8508257f8c64b6a121 /java/sca
parent2a3b526e7e27cd5f9f358c2a0d8204d4804e6dba (diff)
Avoid conflict of Source[] and DataHandler[] in JAXBContext
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675006 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
-rw-r--r--java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
index 30ca226dc1..296c39c50f 100644
--- a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
+++ b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
@@ -32,6 +32,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
+import javax.activation.DataHandler;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
@@ -255,6 +256,7 @@ public class JAXBContextCache {
if (classSet.contains(Source[].class)) {
classSet.remove(Image[].class);
+ classSet.remove(DataHandler[].class);
}
if(classSet.isEmpty()) {