You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/07/09 00:25:12 UTC

svn commit: r675006 - /tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java

Author: rfeng
Date: Tue Jul  8 15:25:11 2008
New Revision: 675006

URL: http://svn.apache.org/viewvc?rev=675006&view=rev
Log:
Avoid conflict of Source[] and DataHandler[] in JAXBContext

Modified:
    tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java

Modified: tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java?rev=675006&r1=675005&r2=675006&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java Tue Jul  8 15:25:11 2008
@@ -32,6 +32,7 @@
 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 @@
 
         if (classSet.contains(Source[].class)) {
             classSet.remove(Image[].class);
+            classSet.remove(DataHandler[].class);
         } 
         
         if(classSet.isEmpty()) {