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 2015/08/10 02:34:57 UTC
[1/2] logging-log4j2 git commit: Revert "Use the more common type
name T instead of L."
Repository: logging-log4j2
Updated Branches:
refs/heads/master 146fa40dd -> a8d901d91
Revert "Use the more common type name T instead of L."
This reverts commit 146fa40dd6b6889277a86f6e5858ffacb672480c.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f54195ec
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f54195ec
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f54195ec
Branch: refs/heads/master
Commit: f54195ec37681ed6a121b0612c0e9ce5adc8fa40
Parents: 146fa40
Author: ggregory <gg...@apache.org>
Authored: Sun Aug 9 17:13:23 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Aug 9 17:13:23 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/spi/LoggerAdapter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f54195ec/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerAdapter.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerAdapter.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerAdapter.java
index 323eef6..6bac9bd 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerAdapter.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerAdapter.java
@@ -23,10 +23,10 @@ import java.io.Closeable;
* Logger classes. This registry should not be used for Log4j Loggers; it is instead used for creating bridges to
* other external log systems.
*
- * @param <T> the external logger class for this registry (e.g., {@code org.slf4j.Logger})
+ * @param <L> the external logger class for this registry (e.g., {@code org.slf4j.Logger})
* @since 2.1
*/
-public interface LoggerAdapter<T> extends Closeable {
+public interface LoggerAdapter<L> extends Closeable {
/**
* Gets a named logger. Implementations should defer to the abstract methods in {@link AbstractLoggerAdapter}.
@@ -34,5 +34,5 @@ public interface LoggerAdapter<T> extends Closeable {
* @param name the name of the logger to get
* @return the named logger
*/
- T getLogger(String name);
+ L getLogger(String name);
}
[2/2] logging-log4j2 git commit: Remove dead code.
Posted by gg...@apache.org.
Remove dead code.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a8d901d9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a8d901d9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a8d901d9
Branch: refs/heads/master
Commit: a8d901d91d149d6dce3e271196629b2358d3fc95
Parents: f54195e
Author: ggregory <gg...@apache.org>
Authored: Sun Aug 9 17:34:55 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Aug 9 17:34:55 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/rewrite/MapRewritePolicy.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8d901d9/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
index ca1f5df..7377b2c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
@@ -129,10 +129,6 @@ public final class MapRewritePolicy implements RewritePolicy {
op = Mode.Add;
} else {
op = Mode.valueOf(mode);
- if (op == null) {
- LOGGER.error("Undefined mode " + mode);
- return null;
- }
}
if (pairs == null || pairs.length == 0) {
LOGGER.error("keys and values must be specified for the MapRewritePolicy");