Author: violetagg
Date: Thu Dec 18 09:51:32 2014
New Revision: 1646420
URL: http://svn.apache.org/r1646420
Log:
Provide the correct array size when invoking toArray()
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1646420&r1=1646419&r2=1646420&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Dec 18 09:51:32 2014
@@ -434,7 +434,7 @@ public class StandardRoot extends Lifecy
@Override
public WebResourceSet[] getPreResources() {
- return preResources.toArray(new WebResourceSet[0]);
+ return preResources.toArray(new WebResourceSet[preResources.size()]);
}
@Override
@@ -445,7 +445,7 @@ public class StandardRoot extends Lifecy
@Override
public WebResourceSet[] getJarResources() {
- return jarResources.toArray(new WebResourceSet[0]);
+ return jarResources.toArray(new WebResourceSet[jarResources.size()]);
}
@Override
@@ -456,11 +456,11 @@ public class StandardRoot extends Lifecy
@Override
public WebResourceSet[] getPostResources() {
- return postResources.toArray(new WebResourceSet[0]);
+ return postResources.toArray(new WebResourceSet[postResources.size()]);
}
protected WebResourceSet[] getClassResources() {
- return classResources.toArray(new WebResourceSet[0]);
+ return classResources.toArray(new
WebResourceSet[classResources.size()]);
}
protected void addClassResources(WebResourceSet webResourceSet) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
