svn commit: r1310091 - /camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java

[cmueller]

Author: cmueller
Date: Thu Apr  5 21:53:54 2012
New Revision: 1310091

URL: http://svn.apache.org/viewvc?rev=1310091&view=rev
Log:
CAMEL-3776: Add pooling support for JAXB data format

Modified:
    
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java

Modified: 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=1310091&r1=1310090&r2=1310091&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 (original)
+++ 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 Thu Apr  5 21:53:54 2012
@@ -132,7 +132,7 @@ public class FallbackTypeConverter imple
             throw new IllegalArgumentException("Cannot convert from null value 
to JAXBSource");
         }
 
-        Unmarshaller unmarshaller = getOrCreateUnmarshaller(type);
+        Unmarshaller unmarshaller = getUnmarshaller(type);
 
         if (parentTypeConverter != null) {
             if (!needFiltering(exchange)) {
@@ -189,7 +189,7 @@ public class FallbackTypeConverter imple
                 marshaller.setProperty(Marshaller.JAXB_ENCODING, 
exchange.getProperty(Exchange.CHARSET_NAME, String.class));
             }
             if (needFiltering(exchange)) {
-                XMLStreamWriter writer = 
exchange.getContext().getTypeConverter().convertTo(XMLStreamWriter.class, 
buffer);
+                XMLStreamWriter writer = 
parentTypeConverter.convertTo(XMLStreamWriter.class, buffer);
                 FilteringXmlStreamWriter filteringWriter = new 
FilteringXmlStreamWriter(writer);
                 marshaller.marshal(value, filteringWriter);
             } else {
@@ -247,7 +247,7 @@ public class FallbackTypeConverter imple
         return context;
     }
 
-    protected synchronized <T> Unmarshaller getOrCreateUnmarshaller(Class<T> 
type) throws JAXBException {
+    protected synchronized <T> Unmarshaller getUnmarshaller(Class<T> type) 
throws JAXBException {
         JAXBContext context = createContext(type);
         return context.createUnmarshaller();
     }