Author: violetagg
Date: Fri Dec 19 15:31:52 2014
New Revision: 1646774
URL: http://svn.apache.org/r1646774
Log:
Merged revision 1646773 from tomcat/trunk:
Use an interface (List) instead of an implementation (ArrayList)
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 15:31:52 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1646774&r1=1646773&r2=1646774&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Fri Dec 19 15:31:52 2014
@@ -67,11 +67,11 @@ public class StandardRoot extends Lifecy
private Context context;
private boolean allowLinking = false;
- private final ArrayList<WebResourceSet> preResources = new ArrayList<>();
+ private final List<WebResourceSet> preResources = new ArrayList<>();
private WebResourceSet main;
- private final ArrayList<WebResourceSet> classResources = new ArrayList<>();
- private final ArrayList<WebResourceSet> jarResources = new ArrayList<>();
- private final ArrayList<WebResourceSet> postResources = new ArrayList<>();
+ private final List<WebResourceSet> classResources = new ArrayList<>();
+ private final List<WebResourceSet> jarResources = new ArrayList<>();
+ private final List<WebResourceSet> postResources = new ArrayList<>();
private final Cache cache = new Cache(this);
private boolean cachingAllowed = true;
@@ -82,8 +82,8 @@ public class StandardRoot extends Lifecy
Collections.newSetFromMap(new
ConcurrentHashMap<TrackedWebResource,Boolean>());
// Constructs to make iteration over all WebResourceSets simpler
- private final ArrayList<WebResourceSet> mainResources = new ArrayList<>();
- private final ArrayList<ArrayList<WebResourceSet>> allResources =
+ private final List<WebResourceSet> mainResources = new ArrayList<>();
+ private final List<List<WebResourceSet>> allResources =
new ArrayList<>();
{
allResources.add(preResources);
@@ -123,7 +123,7 @@ public class StandardRoot extends Lifecy
// WebResourceSet that matters but it is simpler to retain the order
// over all of the JARs.
HashSet<String> result = new LinkedHashSet<>();
- for (ArrayList<WebResourceSet> list : allResources) {
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
if (!webResourceSet.getClassLoaderOnly()) {
String[] entries = webResourceSet.list(path);
@@ -143,7 +143,7 @@ public class StandardRoot extends Lifecy
// Set because we don't want duplicates
HashSet<String> result = new HashSet<>();
- for (ArrayList<WebResourceSet> list : allResources) {
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
if (!webResourceSet.getClassLoaderOnly()) {
result.addAll(webResourceSet.listWebAppPaths(path));
@@ -274,7 +274,7 @@ public class StandardRoot extends Lifecy
WebResource result = null;
WebResource virtual = null;
WebResource mainEmpty = null;
- for (ArrayList<WebResourceSet> list : allResources) {
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
if (useClassLoaderResources ||
!webResourceSet.getClassLoaderOnly()) {
result = webResourceSet.getResource(path);
@@ -319,8 +319,8 @@ public class StandardRoot extends Lifecy
protected WebResource[] getResourcesInternal(String path,
boolean useClassLoaderResources) {
- ArrayList<WebResource> result = new ArrayList<>();
- for (ArrayList<WebResourceSet> list : allResources) {
+ List<WebResource> result = new ArrayList<>();
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
if (useClassLoaderResources ||
!webResourceSet.getClassLoaderOnly()) {
WebResource webResource = webResourceSet.getResource(path);
@@ -372,7 +372,7 @@ public class StandardRoot extends Lifecy
@Override
public void createWebResourceSet(ResourceSetType type, String webAppMount,
String base, String archivePath, String internalPath) {
- ArrayList<WebResourceSet> resourceList;
+ List<WebResourceSet> resourceList;
WebResourceSet resourceSet;
switch (type) {
@@ -649,7 +649,7 @@ public class StandardRoot extends Lifecy
sm.getString("standardRoot.noContext"));
}
- for (ArrayList<WebResourceSet> list : allResources) {
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
webResourceSet.init();
}
@@ -670,7 +670,7 @@ public class StandardRoot extends Lifecy
mainResources.add(main);
- for (ArrayList<WebResourceSet> list : allResources) {
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
webResourceSet.start();
}
@@ -716,7 +716,7 @@ public class StandardRoot extends Lifecy
@Override
protected void stopInternal() throws LifecycleException {
- for (ArrayList<WebResourceSet> list : allResources) {
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
webResourceSet.stop();
}
@@ -755,7 +755,7 @@ public class StandardRoot extends Lifecy
@Override
protected void destroyInternal() throws LifecycleException {
- for (ArrayList<WebResourceSet> list : allResources) {
+ for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
webResourceSet.destroy();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
