Author: rmannibucau
Date: Thu Jun 13 12:09:34 2013
New Revision: 1492638
URL: http://svn.apache.org/r1492638
Log:
TOMEE-976 avoiding /0 in our warmup classes - oops parenthesis error
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=1492638&r1=1492637&r2=1492638&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:09:34 2013
@@ -108,7 +108,7 @@ public class Core {
// no-op
}
- final int part = Math.max(1, (int) Math.round(classes.length * 1. /
permits));
+ final int part = (int) Math.round(classes.length * 1. / Math.max(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=1492638&r1=1492637&r2=1492638&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:09:34 2013
@@ -187,7 +187,7 @@ public class Warmup {
tld.setDaemon(true);
tld.start();
- final int part = Math.max((int) Math.round(classes.length * 1. /
permits), 1);
+ final int part = (int) Math.round(classes.length * 1. /
Math.max(permits, 1));
for (int i = 0; i < permits; i++) {
final int offset = i * part;
final Thread thread = new Thread() {
