From d28a85de5bf7cfc6853e9bfcf818a354ed65937e Mon Sep 17 00:00:00 2001
From: Fiouz <fiouzy@gmail.com>
Date: Fri, 29 Oct 2010 19:55:04 +0000
Subject: [PATCH] Update issue 2270 Status: Fixed Gracefully ignore
 RejectedExecutionException on service shutdown (there's little we can do
 about being shut down)

---
 src/com/fsck/k9/service/CoreService.java | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/service/CoreService.java b/src/com/fsck/k9/service/CoreService.java
index 7c60a12d8..237070a26 100644
--- a/src/com/fsck/k9/service/CoreService.java
+++ b/src/com/fsck/k9/service/CoreService.java
@@ -3,6 +3,7 @@ package com.fsck.k9.service;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import android.app.Service;
@@ -23,6 +24,7 @@ public abstract class CoreService extends Service
     private static AtomicInteger wakeLockSeq = new AtomicInteger(0);
     private ExecutorService threadPool = null;
     private final String className = getClass().getName();
+    private volatile boolean mShutdown = false;
 
     @Override
     public void onCreate()
@@ -146,7 +148,18 @@ public abstract class CoreService extends Service
         {
             if (K9.DEBUG)
                 Log.d(K9.LOG_TAG, "CoreService (" + className + ") queueing Runnable " + runner.hashCode() + " with startId " + startId);
-            threadPool.execute(myRunner);
+            try
+            {
+                threadPool.execute(myRunner);
+            }
+            catch (RejectedExecutionException e)
+            {
+                if (!mShutdown)
+                {
+                    throw e;
+                }
+                Log.i(K9.LOG_TAG, "CoreService: " + className + " is shutting down, ignoring rejected execution exception: " + e.getMessage());
+            }
         }
     }
 
@@ -159,11 +172,18 @@ public abstract class CoreService extends Service
         return null;
     }
 
+    @Override
+    public void onLowMemory()
+    {
+        Log.w(K9.LOG_TAG, "CoreService: " + className + ".onLowMemory() - Running low on memory");
+    }
+
     @Override
     public void onDestroy()
     {
         if (K9.DEBUG)
             Log.i(K9.LOG_TAG, "CoreService: " + className + ".onDestroy()");
+        mShutdown = true;
         threadPool.shutdown();
         super.onDestroy();
         //     MessagingController.getInstance(getApplication()).removeListener(mListener);