Author: markt Date: Thu Sep 3 20:16:12 2015 New Revision: 1701127 URL: http://svn.apache.org/r1701127 Log: No <> in Java 6
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1701127&r1=1701126&r2=1701127&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu Sep 3 20:16:12 2015 @@ -106,7 +106,8 @@ public class InputBuffer extends Reader /** * List of encoders. */ - protected final ConcurrentHashMap<String,B2CConverter> encoders = new ConcurrentHashMap<>(); + protected final ConcurrentHashMap<String,B2CConverter> encoders = + new ConcurrentHashMap<String, B2CConverter>(); /** Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1701127&r1=1701126&r2=1701127&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu Sep 3 20:16:12 2015 @@ -34,7 +34,7 @@ public class TesterAccessLogValve extend // Timing tests need a small error margin to prevent failures private static final long ERROR_MARGIN = 100; - private final Queue<Entry> entries = new ConcurrentLinkedQueue<>(); + private final Queue<Entry> entries = new ConcurrentLinkedQueue<Entry>(); public TesterAccessLogValve() { // Async requests are supported --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org