reverted the modifications I have pushed in a released version by mis…

…take :/ git-svn-id: https://svn.apache.org/repos/asf/mina/tags/2.0.4@1151864 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 28, 2011 · f0444b1 · f0444b1
1 parent 177527b
commit f0444b1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java b/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadPoolExecutor;
 
 import org.apache.mina.core.RuntimeIoException;
 import org.apache.mina.core.session.AbstractIoSession;
@@ -158,8 +157,6 @@ public SimpleIoProcessorPool(Class<? extends IoProcessor<S>> processorType,
 
         if (createdExecutor) {
             this.executor = Executors.newCachedThreadPool();
-            // Set a default reject handler
-            ((ThreadPoolExecutor)this.executor).setRejectedExecutionHandler( new ThreadPoolExecutor.CallerRunsPolicy() );
         } else {
             this.executor = executor;
         }

diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
     <version.deploy.plugin>2.5</version.deploy.plugin>
     <version.gpg.plugin>1.1</version.gpg.plugin>
     <version.jar.plugin>2.3.1</version.jar.plugin>
-    <version.javadoc.plugin>2.8</version.javadoc.plugin>
+    <version.javadoc.plugin>2.5</version.javadoc.plugin>
     <version.jxr.plugin>2.2</version.jxr.plugin>
     <version.model.plugin>2.2.1</version.model.plugin>
     <version.project.plugin>2.2.1</version.project.plugin>