You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/08/21 22:10:34 UTC
svn commit: r1375748 -
/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
Author: rmannibucau
Date: Tue Aug 21 20:10:34 2012
New Revision: 1375748
URL: http://svn.apache.org/viewvc?rev=1375748&view=rev
Log:
can't load a class from the class which loads it, making Warmup class finishing properly its threads makes it obvious
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java?rev=1375748&r1=1375747&r2=1375748&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java Tue Aug 21 20:10:34 2012
@@ -35,14 +35,9 @@ public class Warmup {
*
* This method itself does nothing.
*/
- public static void warmup() {
- }
+ public static void warmup() {}
static {
- initialize();
- }
-
- private static void initialize() {
final String[] classes = {
"java.util.concurrent.TimeUnit",
"java.util.concurrent.atomic.AtomicLong",
@@ -144,7 +139,7 @@ public class Warmup {
"org.apache.tomcat.util.threads.ThreadPoolExecutor",
"org.apache.tomee.catalina.BackportUtil",
"org.apache.tomee.catalina.BackportUtil$1",
- "org.apache.tomee.catalina.TomcatLoader",
+ // "org.apache.tomee.catalina.TomcatLoader", // can't be loaded from here
"org.apache.webbeans.config.WebBeansFinder",
"org.apache.webbeans.container.InjectionResolver",
"org.apache.webbeans.util.WebBeansUtil",
@@ -173,7 +168,7 @@ public class Warmup {
@Override
public void run() {
try {
- TldScanner.scan(TomcatLoader.class.getClassLoader());
+ TldScanner.scan(loader);
} catch (Throwable throwable) {
// no-op
}
@@ -203,6 +198,7 @@ public class Warmup {
semaphore.release();
}
};
+ thread.setName("warmup - " + (i + 1));
thread.setDaemon(true);
thread.start();
}