shutdown executors before connections

Closes #5
notnoop · Nov 28, 2011 · 9241aee · 9241aee
1 parent c0dc601
commit 9241aee
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/com/notnoop/c2dm/internal/C2DMPooledService.java b/src/main/java/com/notnoop/c2dm/internal/C2DMPooledService.java
@@ -31,6 +31,7 @@
 package com.notnoop.c2dm.internal;
 
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -71,8 +72,15 @@ public void run() {
     @Override
     public void stop() {
         super.stop();
-        this.httpClient.getConnectionManager().shutdown();
         this.executor.shutdown();
+        try {
+            if(!this.executor.awaitTermination(5, TimeUnit.SECONDS)) {
+                this.executor.shutdownNow();
+            }
+        } catch (InterruptedException e) {
+        }
+
+        this.httpClient.getConnectionManager().shutdown();
     }
 
 }