This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2dacaea29975b9b5f294aa2af0734610eb86e2d7 Author: Gary Gregory <[email protected]> AuthorDate: Sat Feb 5 14:48:17 2022 -0500 Log4j 1.2 bridge missing DefaultThrowableRenderer. --- .../org/apache/log4j/DefaultThrowableRenderer.java | 84 ++++++++++++++++++++++ src/changes/changes.xml | 3 +- 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java new file mode 100644 index 0000000..1913f9c --- /dev/null +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java @@ -0,0 +1,84 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.log4j; + +import java.io.IOException; +import java.io.InterruptedIOException; +import java.io.LineNumberReader; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; + +import org.apache.log4j.spi.ThrowableRenderer; + +/** + * Default implementation of {@link ThrowableRenderer} using {@link Throwable#printStackTrace(PrintWriter)}. + * + * @since 1.2.16 + */ +public final class DefaultThrowableRenderer implements ThrowableRenderer { + + /** + * Render throwable using Throwable.printStackTrace. + * + * @param throwable throwable, may not be null. + * @return string representation. + */ + public static String[] render(final Throwable throwable) { + final StringWriter sw = new StringWriter(); + final PrintWriter pw = new PrintWriter(sw); + try { + throwable.printStackTrace(pw); + } catch (final RuntimeException ex) { + // ignore + } + pw.flush(); + final LineNumberReader reader = new LineNumberReader(new StringReader(sw.toString())); + final ArrayList<String> lines = new ArrayList<>(); + try { + String line = reader.readLine(); + while (line != null) { + lines.add(line); + line = reader.readLine(); + } + } catch (final IOException ex) { + if (ex instanceof InterruptedIOException) { + Thread.currentThread().interrupt(); + } + lines.add(ex.toString()); + } + final String[] tempRep = new String[lines.size()]; + lines.toArray(tempRep); + return tempRep; + } + + /** + * Construct new instance. + */ + public DefaultThrowableRenderer() { + // empty + } + + /** + * {@inheritDoc} + */ + @Override + public String[] doRender(final Throwable throwable) { + return render(throwable); + } +} diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c7e29b0..276677f 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -325,7 +325,8 @@ <action dev="ggregory" type="fix" due-to="Gary Gregory"> Log4j 1.2 bridge supports the SocketAppender. </action> - <action dev="ggregory" type="fix" due-to="Gary Gregory, Piotr P. Karwasz"> + <action dev="ggregory" type="fix" due-to="Gary Gregory"> + Log4j 1.2 bridge missing DefaultThrowableRenderer. </action> <action dev="ggregory" type="fix"> JndiManager reverts to 2.17.0 behavior: Read the system property for each call.
