Author: rfeng
Date: Tue Jul 8 15:31:44 2008
New Revision: 675008
URL: http://svn.apache.org/viewvc?rev=675008&view=rev
Log:
Merge one more change from trunk for TUSCANY-2465 (r675006)
Modified:
tuscany/branches/sca-java-1.3/modules/ (props changed)
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
Propchange: tuscany/branches/sca-java-1.3/modules/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 8 15:31:44 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules:673298,674894-674933
+/tuscany/java/sca/modules:673298,674894-674933,675006
Modified:
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java?rev=675008&r1=675007&r2=675008&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
(original)
+++
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
Tue Jul 8 15:31:44 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()) {
