[logging-log4j2] branch release-2.x updated: Fix WriterAppender.Builder break

[rg...@apache.org]

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

rgoers 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 8124917  Fix WriterAppender.Builder break
8124917 is described below

commit 81249177c60cd98c35a1e19541d1663af1047442
Author: Carter Kozak <ck...@apache.org>
AuthorDate: Mon Feb 4 09:42:44 2019 -0500

    Fix WriterAppender.Builder break
---
 .../java/org/apache/logging/log4j/core/appender/WriterAppender.java  | 4 ++--
 .../org/apache/logging/log4j/core/appender/WriterAppenderTest.java   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
index 249fb9f..408fed1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
@@ -148,8 +148,8 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
     }
 
     @PluginBuilderFactory
-    public static Builder newBuilder() {
-        return new Builder();
+    public static <B extends Builder<B>> B newBuilder() {
+        return new Builder<B>().asBuilder();
     }
 
     private WriterAppender(final String name, final StringLayout layout, final Filter filter,
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/WriterAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/WriterAppenderTest.java
index fff28e2..dd4b8e0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/WriterAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/WriterAppenderTest.java
@@ -101,4 +101,9 @@ public class WriterAppenderTest {
         test(new StringWriter());
     }
 
+    @Test
+    public void testBuilder() {
+        // This should compile
+        WriterAppender.newBuilder().setTarget(new StringWriter()).setName("testWriterAppender").build();
+    }
 }