From 3b73bc882136ec063315bf8dc051b8e63ac48ad6 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 8 Jul 2008 22:25:11 +0000
Subject: 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
---
 .../java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java  | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'java/sca')

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()) {
-- 
cgit v1.2.3