Author: fschumacher Date: Sun Mar 13 11:30:27 2016 New Revision: 1734786 URL: http://svn.apache.org/viewvc?rev=1734786&view=rev Log: Use ConcurrentMap as interface instead of simple Map.
Merge r1734785 from /tomcat/trunk Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/build.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java Propchange: tomcat/tc8.5.x/trunk/ ------------------------------------------------------------------------------ svn:mergeinfo = /tomcat/trunk:1734785 Modified: tomcat/tc8.5.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1734786&r1=1734785&r2=1734786&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/build.xml (original) +++ tomcat/tc8.5.x/trunk/build.xml Sun Mar 13 11:30:27 2016 @@ -82,8 +82,8 @@ <property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/> <!-- Servlet 4.0 spec requires 1.8+ --> - <property name="compile.source" value="1.8"/> - <property name="compile.target" value="1.8"/> + <property name="compile.source" value="1.7"/> + <property name="compile.target" value="1.7"/> <!-- Locations to create the JAR artifacts --> <!-- Standard JARs --> Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java?rev=1734786&r1=1734785&r2=1734786&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java Sun Mar 13 11:30:27 2016 @@ -16,8 +16,8 @@ */ package org.apache.catalina.tribes.transport; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.apache.catalina.tribes.Member; @@ -27,7 +27,7 @@ public class SenderState { public static final int SUSPECT = 1; public static final int FAILING = 2; - protected static final Map<Member, SenderState> memberStates = new ConcurrentHashMap<>(); + protected static final ConcurrentMap<Member, SenderState> memberStates = new ConcurrentHashMap<>(); public static SenderState getSenderState(Member member) { return getSenderState(member, true); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org