BIS-317 SP-481 : Retry optimistic locking failures on the GUI API.

SVN: 28532

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java

@@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
+import org.springframework.aop.framework.ReflectiveMethodInvocation;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.RootClassFilter;
 import org.springframework.core.Ordered;
@@ -81,7 +82,13 @@ public class OptimisticLockingRetryAdvisor extends DefaultPointcutAdvisor
                 {
                     // System.out.println("try " + (i + 1) + ". time: "
                     // + invocation.getMethod().getName() + "@" + invocation.getThis());
-                    return invocation.proceed();
+                    if (invocation instanceof ReflectiveMethodInvocation)
+                    {
+                        return ((ReflectiveMethodInvocation) invocation).invocableClone().proceed();
+                    } else
+                    {
+                        return invocation.proceed();
+                    }
                 } catch (Exception ex)
                 {
                     latestException = ex;

openbis/source/java/genericApplicationContext.xml

@@ -308,6 +308,11 @@
 
     <bean class="ch.systemsx.cisd.openbis.common.spring.LogAdvisor" />
     <bean class="ch.systemsx.cisd.openbis.common.spring.MarkerLogApplicationListener"/>
+    
+    <!--
+    	// Optimistic Lock Failure Retrying
+    -->
+    <bean class="ch.systemsx.cisd.openbis.generic.server.OptimisticLockingRetryAdvisor" />
 
         
     <!--