Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-09-26 09:10:41 +0000
committerJan Bartel2013-09-30 03:27:05 +0000
commitdf336f3476ca75acedb497dcc60dc699bf91beb9 (patch)
treeb0e5db574753ece00c1419970ccd8342b4304e48
parent04002898263b3d408f7f4851906dfcb7185902ee (diff)
downloadorg.eclipse.jetty.project-df336f3476ca75acedb497dcc60dc699bf91beb9.tar.gz
org.eclipse.jetty.project-df336f3476ca75acedb497dcc60dc699bf91beb9.tar.xz
org.eclipse.jetty.project-df336f3476ca75acedb497dcc60dc699bf91beb9.zip
417561 Refactor annotation related code - remove unneeded log statements
-rw-r--r--jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java4
-rw-r--r--jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java11
2 files changed, 9 insertions, 6 deletions
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
index d38673c65e..7914073488 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
@@ -298,10 +298,10 @@ public class AnnotationConfiguration extends AbstractConfiguration
if (LOG.isDebugEnabled())
{
start = System.nanoTime();
- LOG.debug("Scanning for annotations: webxml={}, configurationDiscovered={}, multiThreaded={}, threads={}",
+ LOG.debug("Scanning for annotations: webxml={}, configurationDiscovered={}, multiThreaded={}",
context.getServletContext().getEffectiveMajorVersion(),
context.isConfigurationDiscovered(),
- multiThreadedScan, maxThreads);
+ multiThreadedScan);
}
parseContainerPath(context, parser);
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
index 201533fdb6..7bac83b6c7 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
@@ -32,6 +32,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
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
//TODO alternative impl
/*
+ long start = System.nanoTime();
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)
{
//skip directories
@@ -875,7 +878,6 @@ public class AnnotationParser
//check file is a valid class file name
if (isValidClassFileName(name) && isValidClassFilePath(name))
{
-
String shortName = name.replace('/', '.').substring(0,name.length()-6);
if ((resolver == null)
@@ -886,9 +888,10 @@ public class AnnotationParser
scanClass(handlers, jarResource, r.getInputStream());
}
}
- }*/
+ }
+ */
- InputStream in = jarResource.getInputStream();
+ InputStream in = jarResource.getInputStream();
if (in==null)
return;
@@ -905,7 +908,7 @@ public class AnnotationParser
finally
{
jar_in.close();
- }
+ }
}
}

Back to the top