Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

417561 Refactor annotation related code - remove unneeded log statements

This commit is contained in:
Jan Bartel 2013-09-26 19:10:41 +10:00
parent 0400289826
commit df336f3476
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
View File

@ -298,10 +298,10 @@ public class AnnotationConfiguration extends AbstractConfiguration
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{ {
start = System.nanoTime(); start = System.nanoTime();
LOG.debug("Scanning for annotations: webxml={}, configurationDiscovered={}, multiThreaded={}, threads={}", LOG.debug("Scanning for annotations: webxml={}, configurationDiscovered={}, multiThreaded={}",
context.getServletContext().getEffectiveMajorVersion(), context.getServletContext().getEffectiveMajorVersion(),
context.isConfigurationDiscovered(), context.isConfigurationDiscovered(),
multiThreadedScan, maxThreads); multiThreadedScan);
} }
parseContainerPath(context, parser); parseContainerPath(context, parser);

11
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -32,6 +32,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.jar.JarInputStream; import java.util.jar.JarInputStream;
@ -862,7 +863,9 @@ public class AnnotationParser
//treat it as a jar that we need to open and scan all entries from //treat it as a jar that we need to open and scan all entries from
//TODO alternative impl //TODO alternative impl
/* /*
long start = System.nanoTime();
Collection<Resource> resources = Resource.newResource("jar:"+jarResource+"!/").getAllResources(); Collection<Resource> resources = Resource.newResource("jar:"+jarResource+"!/").getAllResources();
System.err.println(jarResource+String.valueOf(resources.size())+" resources listed in "+ ((TimeUnit.MILLISECONDS.convert(System.nanoTime()-start, TimeUnit.NANOSECONDS))));
for (Resource r:resources) for (Resource r:resources)
{ {
//skip directories //skip directories
@ -875,7 +878,6 @@ public class AnnotationParser
//check file is a valid class file name //check file is a valid class file name
if (isValidClassFileName(name) && isValidClassFilePath(name)) if (isValidClassFileName(name) && isValidClassFilePath(name))
{ {
String shortName = name.replace('/', '.').substring(0,name.length()-6); String shortName = name.replace('/', '.').substring(0,name.length()-6);
if ((resolver == null) if ((resolver == null)
@ -886,9 +888,10 @@ public class AnnotationParser
scanClass(handlers, jarResource, r.getInputStream()); scanClass(handlers, jarResource, r.getInputStream());
} }
} }
}*/ }
*/
InputStream in = jarResource.getInputStream(); InputStream in = jarResource.getInputStream();
if (in==null) if (in==null)
return; return;
@ -905,7 +908,7 @@ public class AnnotationParser
finally finally
{ {
jar_in.close(); jar_in.close();
} }
} }
} }