Merged revision 1646420 from tomcat/trunk:
Provide the correct array size when invoking toArray()

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1646423 13f79535-47bb-0310-9956-ffa450edef68