SP-481, BIS-317: ensure that OptimisticLockingRetryAdvisor is after LogAdvisor.

SVN: 28596

openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogAdvisor.java

@@ -32,11 +32,12 @@ public class LogAdvisor extends DefaultPointcutAdvisor
 {
 
     private static final long serialVersionUID = 1L;
+    public static final int ORDER = Ordered.HIGHEST_PRECEDENCE;
 
     LogAdvisor()
     {
         super(createPointcut(), createAdvice());
-        setOrder(Ordered.HIGHEST_PRECEDENCE);
+        setOrder(ORDER);
     }
 
     private final static Advice createAdvice()

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

@@ -25,13 +25,13 @@ 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;
 import org.springframework.dao.DeadlockLoserDataAccessException;
 import org.springframework.orm.hibernate3.HibernateOptimisticLockingFailureException;
 
 import ch.systemsx.cisd.common.exceptions.ExceptionUtils;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.openbis.common.spring.LogAdvisor;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 
 /**
@@ -48,7 +48,7 @@ public class OptimisticLockingRetryAdvisor extends DefaultPointcutAdvisor
     public OptimisticLockingRetryAdvisor()
     {
         super(new AllServerMethodsPointcut(), new RetryInterceptor());
-        setOrder(Ordered.HIGHEST_PRECEDENCE);
+        setOrder(LogAdvisor.ORDER + 1);
     }
 
     private static class AllServerMethodsPointcut implements Pointcut