Author: markt
Date: Wed Apr 27 09:57:41 2016
New Revision: 1741191
URL: http://svn.apache.org/viewvc?rev=1741191&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Declare field using interface rather than implementation.
Also:
- Use final
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 09:57:41 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1741191&r1=1741190&r2=1741191&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Wed Apr 27 09:57:41 2016
@@ -132,8 +132,7 @@ public class ReplicatedContext extends S
protected static class ReplApplContext extends ApplicationContext {
- protected final ConcurrentHashMap<String, Object> tomcatAttributes =
- new ConcurrentHashMap<>();
+ protected final Map<String, Object> tomcatAttributes = new
ConcurrentHashMap<>();
public ReplApplContext(ReplicatedContext context) {
super(context);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1741191&r1=1741190&r2=1741191&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Wed Apr 27 09:57:41 2016
@@ -154,7 +154,7 @@ public class SimpleTcpCluster extends Li
private int channelStartOptions = Channel.DEFAULT;
- private Map<Member,ObjectName> memberOnameMap = new ConcurrentHashMap<>();
+ private final Map<Member,ObjectName> memberOnameMap = new
ConcurrentHashMap<>();
// ------------------------------------------------------------- Properties
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
