Author: rmannibucau
Date: Fri Jan 18 11:15:49 2013
New Revision: 1435091
URL: http://svn.apache.org/viewvc?rev=1435091&view=rev
Log:
making test passing
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java?rev=1435091&r1=1435090&r2=1435091&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
Fri Jan 18 11:15:49 2013
@@ -19,7 +19,15 @@ package org.apache.openejb.util;
import org.apache.openejb.loader.Options;
import org.apache.openejb.util.executor.OfferRejectedExecutionHandler;
-import java.util.concurrent.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* @version $Rev$ $Date$
@@ -54,7 +62,6 @@ public class ExecutorBuilder {
return this;
}
- @SuppressWarnings("unchecked")
public ThreadPoolExecutor build(final Options options) {
int corePoolSize = options.get(prefix + ".CorePoolSize", size);
@@ -82,7 +89,7 @@ public class ExecutorBuilder {
// If the user explicitly set the QueueSize to 0, we default QueueType
to SYNCHRONOUS
final QueueType defaultQueueType = (qsize < 1) ? QueueType.SYNCHRONOUS
: QueueType.LINKED;
- final BlockingQueue queue = options.get(prefix + ".QueueType",
defaultQueueType).create(options, prefix, qsize);
+ final BlockingQueue<Runnable> queue = options.get(prefix +
".QueueType", defaultQueueType).create(options, prefix, qsize);
ThreadFactory factory = this.threadFactory;
if (factory == null) {
@@ -118,19 +125,19 @@ public class ExecutorBuilder {
PRIORITY,
SYNCHRONOUS;
- public BlockingQueue create(final Options options, final String
prefix, final int queueSize) {
+ public BlockingQueue<Runnable> create(final Options options, final
String prefix, final int queueSize) {
switch (this) {
case ARRAY: {
- return new ArrayBlockingQueue(queueSize > 0 ? queueSize :
1);
+ return new ArrayBlockingQueue<Runnable>(queueSize > 0 ?
queueSize : 1);
}
case LINKED: {
- return new LinkedBlockingQueue(queueSize > 0 ? queueSize :
1);
+ return new LinkedBlockingQueue<Runnable>(queueSize > 0 ?
queueSize : 1);
}
case PRIORITY: {
- return new PriorityBlockingQueue();
+ return new PriorityBlockingQueue<Runnable>();
}
case SYNCHRONOUS: {
- return new SynchronousQueue(options.get(prefix +
".QueueFair", false));
+ return new SynchronousQueue<Runnable>(options.get(prefix +
".QueueFair", false));
}
default: {
// The Options class will throw an error if the user
supplies an unknown enum string
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java?rev=1435091&r1=1435090&r2=1435091&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
Fri Jan 18 11:15:49 2013
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import java.util.concurrent.TimeoutException;
@@ -346,9 +347,10 @@ public class PoolTest extends TestCase {
final CountDownLatch discard = new CountDownLatch(max - min);
final CountDownLatch hold = new CountDownLatch(1);
- final Pool.Builder builder = new Pool.Builder();
+ final Pool.Builder<Bean> builder = new Pool.Builder<Bean>();
builder.setMinSize(min);
builder.setMaxSize(max);
+ builder.setExecutor(Executors.newFixedThreadPool(5));
builder.setIdleTimeout(new Duration(idleTimeout,
TimeUnit.MILLISECONDS));
builder.setSweepInterval(new Duration(sweepInterval,
TimeUnit.MILLISECONDS));
builder.setSupplier(new Pool.Supplier<Bean>() {
@@ -394,7 +396,7 @@ public class PoolTest extends TestCase {
}
- await(discard, 10, TimeUnit.SECONDS);
+ await(discard, 20, TimeUnit.SECONDS);
// All non-min instances should have been removed
// no more, no less
