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

[rf...@apache.org]

Author: rfeng
Date: Tue Jun 10 16:23:20 2008
New Revision: 666393

URL: http://svn.apache.org/viewvc?rev=666393&view=rev
Log:
Avoid conflict of Image[] and Source[]

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

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java?rev=666393&r1=666392&r2=666393&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java Tue Jun 10 16:23:20 2008
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.sca.databinding.jaxb;
 
+import java.awt.Image;
 import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -41,6 +42,7 @@
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.transform.Source;
 
 /**
  * @version $Rev$ $Date$
@@ -250,6 +252,10 @@
             classSet.remove(UUID[].class);
         }
 
+        if (classSet.contains(Source[].class)) {
+            classSet.remove(Image[].class);
+        } 
+        
         // Is the common one
         if (COMMON_CLASSES_SET.containsAll(classSet)) {
             return commonContext;