You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2009/08/27 22:32:21 UTC
svn commit: r808610 - in
/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml:
JAXBElementXmlProvider.java JAXBXmlProvider.java
Author: bluk
Date: Thu Aug 27 20:32:21 2009
New Revision: 808610
URL: http://svn.apache.org/viewvc?rev=808610&view=rev
Log:
Use OutputStream instead of Writer for JAXBElement
Also, do not need to flush anymore in either
case.
Modified:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java?rev=808610&r1=808609&r2=808610&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java Thu Aug 27 20:32:21 2009
@@ -109,14 +109,11 @@
OutputStream entityStream) throws IOException, WebApplicationException {
try {
Marshaller marshaller = getMarshaller(t.getDeclaredType(), mediaType);
- OutputStreamWriter writer =
- new OutputStreamWriter(entityStream, ProviderUtils.getCharset(mediaType));
- marshaller.marshal(t, writer);
- writer.flush();
+ marshaller.setProperty(Marshaller.JAXB_ENCODING, ProviderUtils.getCharset(mediaType));
+ marshaller.marshal(t, entityStream);
} catch (JAXBException e) {
logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName());
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
-
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java?rev=808610&r1=808609&r2=808610&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java Thu Aug 27 20:32:21 2009
@@ -115,7 +115,6 @@
// Use an OutputStream directly instead of a Writer for performance.
marshaller.marshal(entityToMarshal, entityStream);
- entityStream.flush();
} catch (JAXBException e) {
logger.error(Messages.getMessage("jaxbFailToMarshal"), type.getName());
throw new WebApplicationException(e);