logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1396489 - /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
Date Wed, 10 Oct 2012 07:02:40 GMT
Author: rgoers
Date: Wed Oct 10 07:02:40 2012
New Revision: 1396489

URL: http://svn.apache.org/viewvc?rev=1396489&view=rev
Log:
Fix generics error

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java?rev=1396489&r1=1396488&r2=1396489&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
Wed Oct 10 07:02:40 2012
@@ -41,7 +41,7 @@ public abstract class AbstractAppender e
      */
     private boolean started = false;
 
-    private final Layout layout;
+    private final Layout<?> layout;
 
     private final String name;
 
@@ -55,7 +55,7 @@ public abstract class AbstractAppender e
      * @param filter The Filter to associate with the Appender.
      * @param layout The layout to use to format the event.
      */
-    protected AbstractAppender(String name, Filter filter, Layout layout) {
+    protected AbstractAppender(String name, Filter filter, Layout<?> layout) {
         this(name, filter, layout, true);
     }
 
@@ -67,7 +67,7 @@ public abstract class AbstractAppender e
      * @param handleException If true, exceptions will be logged and suppressed. If false
errors will be
      * logged and then passed to the application.
      */
-    protected AbstractAppender(String name, Filter filter, Layout layout, boolean handleException)
{
+    protected AbstractAppender(String name, Filter filter, Layout<?> layout, boolean
handleException) {
         super(filter);
         this.name = name;
         this.layout = layout;
@@ -116,7 +116,7 @@ public abstract class AbstractAppender e
      * Returns the Layout for the appender.
      * @return The Layout used to format the event.
      */
-    public Layout getLayout() {
+    public Layout<?> getLayout() {
         return layout;
     }
 



Mime
View raw message