[logging-log4j2] branch release-2.x updated: [LOG4J2-3014] Log4j1ConfigurationConverter on Windows produces " " at end of every line.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new 9c7755e  [LOG4J2-3014] Log4j1ConfigurationConverter on Windows 
produces "
" at end of every line.
     new 8446d82  Merge branch 'release-2.x' of 
https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
9c7755e is described below

commit 9c7755e2922dccbf4f5de7416951b1058bfb067f
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Feb 3 09:41:34 2021 -0500

    [LOG4J2-3014] Log4j1ConfigurationConverter on Windows produces "&#xd;"
    at end of every line.
    
    Clean ups.
---
 .../config/builder/impl/DefaultConfigurationBuilder.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 48783a7..766d2ab 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -225,6 +225,13 @@ public class DefaultConfigurationBuilder<T extends 
BuiltConfiguration> implement
         return configuration;
     }
 
+    private String formatXml(String xml)
+        throws TransformerConfigurationException, TransformerException, 
TransformerFactoryConfigurationError {
+        final StringWriter writer = new StringWriter();
+        formatXml(new StreamSource(new StringReader(xml)), new 
StreamResult(writer));
+        return writer.toString();
+    }
+
     @Override
     public void writeXmlConfiguration(final OutputStream output) throws 
IOException {
         try {
@@ -247,19 +254,12 @@ public class DefaultConfigurationBuilder<T extends 
BuiltConfiguration> implement
             writeXmlConfiguration(xmlWriter);
             xmlWriter.close();
             return formatXml(writer.toString());
-        } catch (final XMLStreamException | TransformerException | 
TransformerFactoryConfigurationError e) {
+        } catch (final XMLStreamException | TransformerException e) {
             Throwables.rethrow(e);
         }
         return writer.toString();
     }
 
-    private String formatXml(String xml)
-        throws TransformerConfigurationException, TransformerException, 
TransformerFactoryConfigurationError {
-        final StringWriter writer = new StringWriter();
-        formatXml(new StreamSource(new StringReader(xml)), new 
StreamResult(writer));
-        return writer.toString();
-    }
-
     private void writeXmlConfiguration(final XMLStreamWriter xmlWriter) throws 
XMLStreamException {
         xmlWriter.writeStartDocument();
         xmlWriter.writeStartElement("Configuration");