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 2012/11/03 01:06:03 UTC

svn commit: r1405227 - in /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender: FileManager.java OutputStreamManager.java

Author: ggregory
Date: Sat Nov  3 00:06:03 2012
New Revision: 1405227

URL: http://svn.apache.org/viewvc?rev=1405227&view=rev
Log:
Use generics and fix compile warnings.

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

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java?rev=1405227&r1=1405226&r2=1405227&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java Sat Nov  3 00:06:03 2012
@@ -31,7 +31,7 @@ import java.nio.channels.FileLock;
  */
 public class FileManager extends OutputStreamManager {
 
-    private static final ManagerFactory factory = new FileManagerFactory();
+    private static final FileManagerFactory factory = new FileManagerFactory();
 
     private final boolean isAppend;
     private final boolean isLocking;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java?rev=1405227&r1=1405226&r2=1405227&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java Sat Nov  3 00:06:03 2012
@@ -43,7 +43,7 @@ public class OutputStreamManager extends
      * @return An OutputStreamManager.
      */
     public static <T> OutputStreamManager getManager(String name, T data,
-                                                 ManagerFactory<OutputStreamManager, T> factory) {
+                                                 ManagerFactory<? extends OutputStreamManager, T> factory) {
         return AbstractManager.getManager(name, factory, data);
     }