You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2020/07/09 12:34:45 UTC
svn commit: r1879704 - in /jackrabbit/branches/2.20: ./
jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ProppatchTest.java
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
Author: reschke
Date: Thu Jul 9 12:34:44 2020
New Revision: 1879704
URL: http://svn.apache.org/viewvc?rev=1879704&view=rev
Log:
JCR-4583: remove XML serialization workaround for ancient Java versions (merged r1878725 and r1878752 into 2.20)
Added:
jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ProppatchTest.java
- copied unchanged from r1878725, jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ProppatchTest.java
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1878725,1878752
Modified: jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java?rev=1879704&r1=1879703&r2=1879704&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java Thu Jul 9 12:34:44 2020
@@ -39,10 +39,7 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.transform.TransformerException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
import java.util.Locale;
/**
@@ -138,13 +135,7 @@ public class WebdavResponseImpl implemen
try {
Document doc = DomUtil.createDocument();
doc.appendChild(serializable.toXml(doc));
-
- // JCR-2636: Need to use an explicit OutputStreamWriter
- // instead of relying on the built-in UTF-8 serialization
- // to avoid problems with surrogate pairs on Sun JRE 1.5.
- Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
- DomUtil.transformDocument(doc, writer);
- writer.flush();
+ DomUtil.transformDocument(doc, out);
// TODO: Should this be application/xml? See JCR-1621
httpResponse.setContentType("text/xml; charset=UTF-8");