You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/22 20:30:08 UTC
[tomcat] branch 7.0.x updated: Few more places where parameterized
collection constructors can be used
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 264e164 Few more places where parameterized collection constructors can be used
264e164 is described below
commit 264e164ebb16f333a38bcf868eb4b88927fa146b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 22 21:18:59 2020 +0100
Few more places where parameterized collection constructors can be used
---
java/org/apache/catalina/core/ApplicationContext.java | 3 +--
java/org/apache/catalina/core/StandardContext.java | 4 +---
java/org/apache/catalina/ha/session/BackupManager.java | 6 ++----
java/org/apache/catalina/session/PersistentManagerBase.java | 6 ++----
java/org/apache/catalina/startup/ContextConfig.java | 3 +--
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 7 +++----
java/org/apache/jasper/compiler/PageInfo.java | 3 +--
test/org/apache/tomcat/websocket/server/TestClose.java | 3 +--
8 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index 7033395..77f07a2 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1362,8 +1362,7 @@ public class ApplicationContext implements ServletContext {
protected void clearAttributes() {
// Create list of attributes to be removed
- List<String> list = new ArrayList<String>();
- list.addAll(attributes.keySet());
+ List<String> list = new ArrayList<String>(attributes.keySet());
// Remove application originated attributes
// (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 495f46a..4624917 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3920,9 +3920,7 @@ public class StandardContext extends ContainerBase
*/
@Override
public String[] findParameters() {
- List<String> parameterNames = new ArrayList<String>(parameters.size());
- parameterNames.addAll(parameters.keySet());
- return parameterNames.toArray(new String[0]);
+ return parameters.keySet().toArray(new String[0]);
}
diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java
index ac642f1..6721f32 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -281,10 +281,8 @@ public class BackupManager extends ClusterManagerBase
@Override
public Set<String> getSessionIdsFull() {
- Set<String> sessionIds = new HashSet<String>();
- LazyReplicatedMap<String,Session> map =
- (LazyReplicatedMap<String,Session>)sessions;
- sessionIds.addAll(map.keySetFull());
+ LazyReplicatedMap<String,Session> map = (LazyReplicatedMap<String,Session>)sessions;
+ Set<String> sessionIds = new HashSet<String>(map.keySetFull());
return sessionIds;
}
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java
index 28541a8..3020dcf 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -677,11 +677,9 @@ public abstract class PersistentManagerBase extends ManagerBase
public Set<String> getSessionIdsFull() {
// In memory session ID list
Set<String> sessionIds = new HashSet<String>(sessions.keySet());
- // Store session ID list
- String[] storeKeys;
try {
- storeKeys = getStore().keys();
- sessionIds.addAll(Arrays.asList(storeKeys));
+ // Store session ID list
+ sessionIds.addAll(Arrays.asList(getStore().keys()));
} catch (IOException e) {
log.warn(sm.getString("persistentManager.storeKeysException"));
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index ada14e1..24e83b5 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1333,8 +1333,7 @@ public class ContextConfig implements LifecycleListener {
if (ok) {
// Spec does not define an order.
// Use ordered JARs followed by remaining JARs
- Set<WebXml> resourceJars = new LinkedHashSet<WebXml>();
- resourceJars.addAll(orderedFragments);
+ Set<WebXml> resourceJars = new LinkedHashSet<WebXml>(orderedFragments);
for (WebXml fragment : fragments.values()) {
if (!resourceJars.contains(fragment)) {
resourceJars.add(fragment);
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index 9ff64c7..2c2f954 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -373,10 +373,9 @@ public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> {
}
}
public String getAllowedTrailerHeaders() {
- // Chances of a size change between these lines are small enough that a
- // sync is unnecessary.
- List<String> copy = new ArrayList<String>(allowedTrailerHeaders.size());
- copy.addAll(allowedTrailerHeaders);
+ // Chances of a change during execution of this line are small enough
+ // that a sync is unnecessary.
+ List<String> copy = new ArrayList<String>(allowedTrailerHeaders);
StringBuilder result = new StringBuilder();
boolean first = true;
for (String header : copy) {
diff --git a/java/org/apache/jasper/compiler/PageInfo.java b/java/org/apache/jasper/compiler/PageInfo.java
index f546add..d83519c 100644
--- a/java/org/apache/jasper/compiler/PageInfo.java
+++ b/java/org/apache/jasper/compiler/PageInfo.java
@@ -110,7 +110,6 @@ class PageInfo {
this.jspPrefixMapper = new HashMap<String, String>();
this.xmlPrefixMapper = new HashMap<String, LinkedList<String>>();
this.nonCustomTagPrefixMap = new HashMap<String, Mark>();
- this.imports = new Vector<String>();
this.dependants = new HashMap<String,Long>();
this.includePrelude = new Vector<String>();
this.includeCoda = new Vector<String>();
@@ -118,7 +117,7 @@ class PageInfo {
this.prefixes = new HashSet<String>();
// Enter standard imports
- imports.addAll(Constants.STANDARD_IMPORTS);
+ this.imports = new Vector<String>(Constants.STANDARD_IMPORTS);
}
public boolean isTagFile() {
diff --git a/test/org/apache/tomcat/websocket/server/TestClose.java b/test/org/apache/tomcat/websocket/server/TestClose.java
index 19d2c55..813141d 100644
--- a/test/org/apache/tomcat/websocket/server/TestClose.java
+++ b/test/org/apache/tomcat/websocket/server/TestClose.java
@@ -92,8 +92,7 @@ public class TestClose extends WebSocketBaseTest {
public static void awaitOnClose(CloseCode... codes) {
- Set<CloseCode> set = new HashSet<CloseCode>();
- set.addAll(Arrays.asList(codes));
+ Set<CloseCode> set = new HashSet<CloseCode>(Arrays.asList(codes));
awaitOnClose(set);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org