You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/09/01 18:23:48 UTC
logging-log4j2 git commit: Use Throwables.rethrow(e) hack.
Repository: logging-log4j2
Updated Branches:
refs/heads/master d17b90426 -> 97ba63d58
Use Throwables.rethrow(e) hack.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/97ba63d5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/97ba63d5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/97ba63d5
Branch: refs/heads/master
Commit: 97ba63d586f03ec51b7012eec093b22528cfd630
Parents: d17b904
Author: ggregory <gg...@apache.org>
Authored: Thu Sep 1 11:23:44 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu Sep 1 11:23:44 2016 -0700
----------------------------------------------------------------------
.../config/builder/impl/DefaultConfigurationBuilder.java | 5 +++--
.../logging/log4j/core/appender/FileAppenderTest.java | 11 ++++++-----
.../logging/log4j/core/appender/SocketAppenderTest.java | 11 ++++++-----
.../log4j/core/config/CompositeConfigurationTest.java | 5 +++--
.../logging/log4j/core/net/mock/MockUdpSyslogServer.java | 6 ++++--
5 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/97ba63d5/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
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 4319515..62fd716 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
@@ -42,6 +42,7 @@ import org.apache.logging.log4j.core.config.builder.api.LoggerComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ScriptComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ScriptFileComponentBuilder;
+import org.apache.logging.log4j.core.util.Throwables;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
@@ -206,7 +207,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
if (e.getNestedException() instanceof IOException) {
throw (IOException)e.getNestedException();
}
- throw new RuntimeException(e);
+ Throwables.rethrow(e);
}
}
@@ -218,7 +219,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
writeXmlConfiguration(xmlWriter);
xmlWriter.close();
} catch (XMLStreamException e) {
- throw new RuntimeException(e);
+ Throwables.rethrow(e);
}
return sw.toString();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/97ba63d5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
index 0ffb9a0..989f861 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
@@ -37,6 +37,7 @@ import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.layout.PatternLayout;
+import org.apache.logging.log4j.core.util.Throwables;
import org.apache.logging.log4j.junit.CleanFiles;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.util.Strings;
@@ -311,9 +312,9 @@ public class FileAppenderTest {
try {
writer(lock, logEventCount, thread.getName(), createOnDemand, true);
- } catch (final Exception ex) {
- exceptionRef[0] = ex;
- throw new RuntimeException(ex);
+ } catch (final Exception e) {
+ exceptionRef[0] = e;
+ Throwables.rethrow(e);
}
}
}
@@ -344,8 +345,8 @@ public class FileAppenderTest {
writer(lock, count, id, createOnDemand, true);
// thread.sleep(50);
- } catch (final Exception ex) {
- throw new RuntimeException(ex);
+ } catch (final Exception e) {
+ Throwables.rethrow(e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/97ba63d5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 2db50ab..705b242 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -44,6 +44,7 @@ import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.net.Protocol;
+import org.apache.logging.log4j.core.util.Throwables;
import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.After;
import org.junit.AfterClass;
@@ -275,10 +276,10 @@ public class SocketAppenderTest {
final LogEvent event = (LogEvent) received;
list.add(event);
}
- } catch (final Throwable ex) {
- ex.printStackTrace();
+ } catch (final Throwable e) {
+ e.printStackTrace();
if (!shutdown) {
- throw new RuntimeException(ex);
+ Throwables.rethrow(e);
}
}
}
@@ -311,9 +312,9 @@ public class SocketAppenderTest {
}
} catch (final EOFException eof) {
// Socket is closed.
- } catch (final Exception ex) {
+ } catch (final Exception e) {
if (!shutdown) {
- throw new RuntimeException(ex);
+ Throwables.rethrow(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/97ba63d5/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
index 1e78cac..53deae9 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
@@ -23,6 +23,7 @@ import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.FileAppender;
import org.apache.logging.log4j.core.config.composite.CompositeConfiguration;
+import org.apache.logging.log4j.core.util.Throwables;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.Assert;
import org.junit.Test;
@@ -208,8 +209,8 @@ public class CompositeConfigurationTest {
rule.apply(statement, Description
.createTestDescription(getClass(), Thread.currentThread().getStackTrace()[1].getMethodName()))
.evaluate();
- } catch (final Throwable throwable) {
- throw new RuntimeException(throwable);
+ } catch (final Throwable e) {
+ Throwables.rethrow(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/97ba63d5/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
index 92b4beb..8f7fe73 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
@@ -20,6 +20,8 @@ import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.SocketException;
+import org.apache.logging.log4j.core.util.Throwables;
+
public class MockUdpSyslogServer extends MockSyslogServer {
private final DatagramSocket socket;
private boolean shutdown = false;
@@ -48,9 +50,9 @@ public class MockUdpSyslogServer extends MockSyslogServer {
final String str = new String(packet.getData(), 0, packet.getLength());
messageList.add(str);
}
- } catch (final Exception ex) {
+ } catch (final Exception e) {
if (!shutdown) {
- throw new RuntimeException(ex);
+ Throwables.rethrow(e);
}
}
}