Work on issue stephanenicolas#270

seva-ask · Jun 11, 2014 · 2af4ea7 · 2af4ea7
1 parent 1894fab
commit 2af4ea7
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/robospice-core-parent/robospice/src/main/java/com/octo/android/robospice/SpiceManager.java b/robospice-core-parent/robospice/src/main/java/com/octo/android/robospice/SpiceManager.java
@@ -1320,29 +1320,32 @@ public SpiceManagerCommand(SpiceManager spiceManager) {
 
         @Override
         public T call() {
-            synchronized (spiceManager) {
-                if (spiceManager.isStopped) {
+            try {
+                spiceManager.waitForServiceToBeBound();
+                if (spiceManager.spiceService == null) {
                     return null;
                 }
+
+                spiceManager.lockSendRequestsToService.lock();
                 try {
-                    spiceManager.waitForServiceToBeBound();
-                    if (spiceManager.spiceService == null) {
+                    if (spiceManager.spiceService == null || spiceManager.isStopped) {
                         return null;
                     }
-                } catch (InterruptedException e) {
-                    Ln.e(e, "Spice command %s couldn't bind to service.", getClass().getName());
-                }
-
-                try {
                     T result = executeWhenBound(spiceManager.spiceService);
                     successFull = true;
                     return result;
                 } catch (Exception e) {
                     Ln.e(e);
                     this.exception = e;
                     return null;
+                } finally {
+                    spiceManager.lockSendRequestsToService.unlock();
                 }
+            } catch (InterruptedException e) {
+                Ln.e(e, "Spice command %s couldn't bind to service.", getClass().getName());
+                return null;
             }
+
         }
 
         protected abstract T executeWhenBound(SpiceService service) throws Exception;