Author: fschumacher Date: Fri Mar 13 20:16:54 2015 New Revision: 1666564 URL: http://svn.apache.org/r1666564 Log: No Diamonds in java 6.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1666564&r1=1666563&r2=1666564&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri Mar 13 20:16:54 2015 @@ -211,7 +211,7 @@ public abstract class AbstractHttp11Prot public void setAllowedTrailerHeaders(String commaSeparatedHeaders) { // Jump through some hoops so we don't end up with an empty set while // doing updates. - Set<String> toRemove = new HashSet<>(); + Set<String> toRemove = new HashSet<String>(); toRemove.addAll(allowedTrailerHeaders); if (commaSeparatedHeaders != null) { String[] headers = commaSeparatedHeaders.split(","); @@ -229,7 +229,7 @@ public abstract class AbstractHttp11Prot public String getAllowedTrailerHeaders() { // Chances of a size change between these lines are small enough that a // sync is unnecessary. - List<String> copy = new ArrayList<>(allowedTrailerHeaders.size()); + List<String> copy = new ArrayList<String>(allowedTrailerHeaders.size()); copy.addAll(allowedTrailerHeaders); StringBuilder result = new StringBuilder(); boolean first = true; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org