svn commit: r636236 - /mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java

[trustin]

Author: trustin
Date: Wed Mar 12 00:31:27 2008
New Revision: 636236

URL: http://svn.apache.org/viewvc?rev=636236&view=rev
Log:
Fixed RejectedExecutionException

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java?rev=636236&r1=636235&r2=636236&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java 
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java 
Wed Mar 12 00:31:27 2008
@@ -224,10 +224,6 @@
                 } catch (Exception e) {
                     ExceptionMonitor.getInstance().exceptionCaught(e);
                 } finally {
-                    if (createdExecutor) {
-                        ((ExecutorService) executor).shutdown();
-                    }
-                    
                     if (disposalFuture == null) {
                         disposed = true;
                     }
@@ -241,6 +237,7 @@
         }
         if (createdExecutor) {
             ExecutorService e = (ExecutorService) executor;
+            e.shutdown();
             while (!e.isTerminated()) {
                 try {
                     e.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);