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 2013/06/13 14:08:27 UTC

svn commit: r1492636 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/Core.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java

Author: rmannibucau
Date: Thu Jun 13 12:08:26 2013
New Revision: 1492636

URL: http://svn.apache.org/r1492636
Log:
TOMEE-976 avoiding /0 in our warmup classes

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Core.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Core.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Core.java?rev=1492636&r1=1492635&r2=1492636&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Core.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/Core.java Thu Jun 13 12:08:26 2013
@@ -108,7 +108,7 @@ public class Core {
             // no-op
         }
 
-        final int part = (int) Math.round(classes.length * 1. / permits);
+        final int part = Math.max(1, (int) Math.round(classes.length * 1. / permits));
         for (int i = 0; i < permits; i++) {
             final int current = i;
             final int offset = i * part;

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java?rev=1492636&r1=1492635&r2=1492636&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java Thu Jun 13 12:08:26 2013
@@ -187,7 +187,7 @@ public class Warmup {
         tld.setDaemon(true);
         tld.start();
 
-        final int part = (int) Math.round(classes.length * 1. / permits);
+        final int part = Math.max((int) Math.round(classes.length * 1. / permits), 1);
         for (int i = 0; i < permits; i++) {
             final int offset = i * part;
             final Thread thread = new Thread() {