LMS-2675 - InfectX: retry API methods when they fail - handle more communication exceptions

SVN: 23920

common/source/java/ch/systemsx/cisd/common/retry/RetryCaller.java

@@ -16,6 +16,10 @@
 
 package ch.systemsx.cisd.common.retry;
 
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+
+import org.springframework.remoting.RemoteAccessException;
 import org.springframework.remoting.RemoteConnectFailureException;
 
 import ch.systemsx.cisd.common.retry.config.DefaultRetryConfiguration;
@@ -72,21 +76,41 @@ public abstract class RetryCaller<T, E extends Throwable>
             {
                 T result = call();
                 return result;
-            } catch (RemoteConnectFailureException e)
+            } catch (RuntimeException e)
             {
-                if (shouldRetry())
+                if (isCommunicationException(e))
                 {
-                    System.err.println("Call failed - will retry");
-                    waitForRetry();
+                    if (shouldRetry())
+                    {
+                        System.err.println("Communication failed - will retry");
+                        waitForRetry();
+                    } else
+                    {
+                        System.err.println("Communication failed - will NOT retry");
+                        throw e;
+                    }
                 } else
                 {
-                    System.err.println("Call failed - will NOT retry");
                     throw e;
                 }
             }
         }
     }
 
+    private boolean isCommunicationException(RuntimeException e)
+    {
+        if (e instanceof RemoteConnectFailureException)
+        {
+            return true;
+        }
+        if (e instanceof RemoteAccessException)
+        {
+            return e.getCause() instanceof SocketTimeoutException
+                    || e.getCause() instanceof SocketException;
+        }
+        return false;
+    }
+
     private boolean shouldRetry()
     {
         return retryCounter < configuration.getMaximumNumberOfRetries();

common/sourceTest/java/ch/systemsx/cisd/common/retry/RetryCallerTest.java

@@ -16,10 +16,13 @@
 
 package ch.systemsx.cisd.common.retry;
 
+import java.net.SocketTimeoutException;
+
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.api.Invocation;
 import org.jmock.lib.action.CustomAction;
+import org.springframework.remoting.RemoteAccessException;
 import org.springframework.remoting.RemoteConnectFailureException;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
@@ -78,7 +81,7 @@ public class RetryCallerTest
     }
 
     @Test
-    public void testCallWithCommunicationErrorShouldBeRetried() throws Throwable
+    public void testCallWithConnectErrorShouldBeRetried() throws Throwable
     {
         mockery.checking(new Expectations()
             {
@@ -93,6 +96,22 @@ public class RetryCallerTest
         mockery.assertIsSatisfied();
     }
 
+    @Test
+    public void testCallWithTimeoutErrorShouldBeRetried() throws Throwable
+    {
+        mockery.checking(new Expectations()
+            {
+                {
+                    oneOf(runnable).run();
+                    will(throwException(new RemoteAccessException("", new SocketTimeoutException())));
+                    oneOf(runnable).run();
+                }
+            });
+
+        caller.callWithRetry();
+        mockery.assertIsSatisfied();
+    }
+
     @Test
     void testCallWithManyCommunicationErrorsShouldBeRetriedWithIncreasingWaitingTime()
             throws Throwable