Work on issue #246. Seems solved.

stephanenicolas · Jan 13, 2014 · 0db4b1b · 0db4b1b
1 parent 8e87a20
commit 0db4b1b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 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
@@ -251,7 +251,7 @@ public void run() {
             if (spiceService == null) {
                 return;
             }
-            while (!isStopped && !Thread.interrupted()) {
+            while (!requestQueue.isEmpty() || !isStopped && !Thread.interrupted()) {
                 try {
                     sendRequestToService(requestQueue.take());
                 } catch (final InterruptedException ex) {
@@ -1226,7 +1226,7 @@ protected void waitForServiceToBeBound() throws InterruptedException {
 
         lockAcquireService.lock();
         try {
-            while (spiceService == null && !isStopped) {
+            while (spiceService == null && (!requestQueue.isEmpty() || !isStopped)) {
                 conditionServiceBound.await();
             }
             Ln.d("Bound ok.");

diff --git a/robospice-core-parent/robospice/src/main/java/com/octo/android/robospice/SpiceService.java b/robospice-core-parent/robospice/src/main/java/com/octo/android/robospice/SpiceService.java
@@ -210,7 +210,7 @@ protected ExecutorService getExecutorService() {
 
     /**
      * Creates the SpiceServiceListenerNotifier.
-     * @return ({@link SpiceServiceListenerNotifier)
+     * @return ({@link SpiceServiceListenerNotifier)}
      */
     protected SpiceServiceListenerNotifier createSpiceServiceListenerNotifier() {
         return new SpiceServiceListenerNotifier();

diff --git a/...c/main/java/com/octo/android/robospice/request/notifier/SpiceServiceListenerNotifier.java b/...c/main/java/com/octo/android/robospice/request/notifier/SpiceServiceListenerNotifier.java
@@ -117,7 +117,7 @@ public void notifyObserversOfRequestCancellation(CachedSpiceRequest<?> request)
     /**
      * Notify interested observers of request progress.
      * @param request the request in progress.
-     * @param progress the progress of the request.
+     * @param requestProgress the progress of the request.
      */
     public void notifyObserversOfRequestProgress(CachedSpiceRequest<?> request, RequestProgress requestProgress) {
         RequestProcessingContext requestProcessingContext = new RequestProcessingContext();

diff --git a/...ice-core-parent/robospice/src/main/java/com/octo/android/robospice/retry/RetryPolicy.java b/...ice-core-parent/robospice/src/main/java/com/octo/android/robospice/retry/RetryPolicy.java
@@ -14,7 +14,8 @@ public interface RetryPolicy {
      */
     int getRetryCount();
 
-    /** @return the delay to sleep between each retry attempt (in ms). */
+    /** Hook method invoked when an exception occured. Define your retry strategy here.
+     * @param e the exception that occured during last request invocation. */
     void retry(SpiceException e);
 
     /** @return the delay to sleep between each retry attempt (in ms). */