Author: kkolinko
Date: Fri Nov 21 21:08:39 2014
New Revision: 1641003
URL: http://svn.apache.org/r1641003
Log:
Close Jars opened during a test.
Backport of r1641001 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1641000
Merged /tomcat/tc8.0.x/trunk:r1641001
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java?rev=1641003&r1=1641002&r2=1641003&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
Fri Nov 21 21:08:39 2014
@@ -52,21 +52,25 @@ public class TesterPerformance {
for (URL jarURL : jarURLs) {
Jar jar = JarFactory.newInstance(jarURL);
- jar.nextEntry();
- String jarEntryName = jar.getEntryName();
- while (jarEntryName != null) {
- if (jarEntryName.endsWith(".class")) {
- InputStream is = jar.getEntryInputStream();
- long start = System.nanoTime();
- ClassParser cp = new ClassParser(is);
- cp.parse();
- duration += System.nanoTime() - start;
- }
+ try {
jar.nextEntry();
- jarEntryName = jar.getEntryName();
+ String jarEntryName = jar.getEntryName();
+ while (jarEntryName != null) {
+ if (jarEntryName.endsWith(".class")) {
+ InputStream is = jar.getEntryInputStream();
+ long start = System.nanoTime();
+ ClassParser cp = new ClassParser(is);
+ cp.parse();
+ duration += System.nanoTime() - start;
+ }
+ jar.nextEntry();
+ jarEntryName = jar.getEntryName();
+ }
+ } finally {
+ jar.close();
}
}
- System.out.println("ClassParser performance test took: " + duration +
"ns");
+ System.out.println("ClassParser performance test took: " + duration +
" ns");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
