tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1380374 - in /tomcat/trunk/java/org/apache/juli: AsyncFileHandler.java ClassLoaderLogManager.java
Date Mon, 03 Sep 2012 21:34:26 GMT
Author: markt
Date: Mon Sep  3 21:34:26 2012
New Revision: 1380374

URL: http://svn.apache.org/viewvc?rev=1380374&view=rev
Log:
Clean-up
- Java 7 <>

Modified:
    tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
    tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java

Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=1380374&r1=1380373&r2=1380374&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Mon Sep  3 21:34:26 2012
@@ -56,7 +56,7 @@ public class AsyncFileHandler extends Fi
             System.getProperty("org.apache.juli.AsyncLoggerPollInterval","1000"));
 
     protected static final LinkedBlockingDeque<LogEntry> queue =
-            new LinkedBlockingDeque<LogEntry>(DEFAULT_MAX_RECORDS);
+            new LinkedBlockingDeque<>(DEFAULT_MAX_RECORDS);
 
     protected static final LoggerThread logger = new LoggerThread();
 

Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1380374&r1=1380373&r2=1380374&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Mon Sep  3 21:34:26 2012
@@ -79,14 +79,14 @@ public class ClassLoaderLogManager exten
      * application redeployment.
      */
     protected final Map<ClassLoader, ClassLoaderLogInfo> classLoaderLoggers =
-        new WeakHashMap<ClassLoader, ClassLoaderLogInfo>();
+        new WeakHashMap<>();
 
 
     /**
      * This prefix is used to allow using prefixes for the properties names
      * of handlers and their subcomponents.
      */
-    protected final ThreadLocal<String> prefix = new ThreadLocal<String>();
+    protected final ThreadLocal<String> prefix = new ThreadLocal<>();
 
 
     /**
@@ -599,8 +599,7 @@ public class ClassLoaderLogManager exten
     protected static final class LogNode {
         Logger logger;
 
-        protected final Map<String, LogNode> children =
-            new HashMap<String, LogNode>();
+        protected final Map<String, LogNode> children = new HashMap<>();
 
         protected final LogNode parent;
 
@@ -668,8 +667,8 @@ public class ClassLoaderLogManager exten
 
     protected static final class ClassLoaderLogInfo {
         final LogNode rootNode;
-        final Map<String, Logger> loggers = new HashMap<String, Logger>();
-        final Map<String, Handler> handlers = new HashMap<String, Handler>();
+        final Map<String, Logger> loggers = new HashMap<>();
+        final Map<String, Handler> handlers = new HashMap<>();
         final Properties props = new Properties();
 
         ClassLoaderLogInfo(final LogNode rootNode) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message