You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2011/07/28 16:31:19 UTC

svn commit: r1151871 - in /mina/branches/2.0.5: mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java pom.xml

Author: elecharny
Date: Thu Jul 28 14:31:18 2011
New Revision: 1151871

URL: http://svn.apache.org/viewvc?rev=1151871&view=rev
Log:
applied the fix done in 2.0.4 tags by mistake to the branch

Modified:
    mina/branches/2.0.5/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
    mina/branches/2.0.5/pom.xml

Modified: mina/branches/2.0.5/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
URL: http://svn.apache.org/viewvc/mina/branches/2.0.5/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java?rev=1151871&r1=1151870&r2=1151871&view=diff
==============================================================================
--- mina/branches/2.0.5/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java (original)
+++ mina/branches/2.0.5/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java Thu Jul 28 14:31:18 2011
@@ -24,6 +24,7 @@ import java.util.Arrays;
 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;
@@ -157,6 +158,8 @@ public class SimpleIoProcessorPool<S ext
         
         if (createdExecutor) {
             this.executor = Executors.newCachedThreadPool();
+            // Set a default reject handler
+            ((ThreadPoolExecutor)this.executor).setRejectedExecutionHandler( new ThreadPoolExecutor.CallerRunsPolicy() );
         } else {
             this.executor = executor;
         }

Modified: mina/branches/2.0.5/pom.xml
URL: http://svn.apache.org/viewvc/mina/branches/2.0.5/pom.xml?rev=1151871&r1=1151870&r2=1151871&view=diff
==============================================================================
--- mina/branches/2.0.5/pom.xml (original)
+++ mina/branches/2.0.5/pom.xml Thu Jul 28 14:31:18 2011
@@ -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.5</version.javadoc.plugin>
+    <version.javadoc.plugin>2.8</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>