From dd2da8ff85347878f9f6dc7198e1d4f378321b40 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 12 Mar 2013 09:05:41 +0000
Subject: [PATCH] SP-481, BIS-317: Remove OptimisticLockingRetryAdvisor in
published servers in order to have two OptimisticLockingRetryAdvisor in the
caller chain.
SVN: 28594
---
.../cisd/openbis/generic/server/CommonServiceServer.java | 2 --
.../systemsx/cisd/openbis/generic/server/ETLServiceServer.java | 2 +-
.../generic/server/ServiceConversationServerManager.java | 1 -
.../openbis/plugin/generic/server/GenericServiceServer.java | 3 ---
4 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
index cc1f0ff153c..7f51e5203e5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
@@ -41,8 +41,6 @@ public class CommonServiceServer extends HttpInvokerServiceExporter
{
setServiceInterface(ICommonServer.class);
setService(common);
- setInterceptors(new Object[]
- { new OptimisticLockingRetryAdvisor() });
super.afterPropertiesSet();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
index 67d88060cad..84d3298065b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
@@ -47,7 +47,7 @@ public class ETLServiceServer extends HttpInvokerServiceExporter
setServiceInterface(IServiceForDataStoreServer.class);
setService(etlService);
setInterceptors(new Object[]
- { createExceptionTranslator(), new OptimisticLockingRetryAdvisor() });
+ { createExceptionTranslator() });
super.afterPropertiesSet();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
index f8b8efc2797..1b2648007fe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
@@ -74,7 +74,6 @@ public class ServiceConversationServerManager extends BaseServiceConversationSer
public void setEtlService(IServiceForDataStoreServer etlService)
{
ProxyFactory factory = new ProxyFactory(etlService);
- factory.addAdvisor(new OptimisticLockingRetryAdvisor());
this.etlService = (IServiceForDataStoreServer) factory.getProxy();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
index 4a162bd1c52..0616d802521 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
@@ -22,7 +22,6 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import ch.systemsx.cisd.openbis.generic.server.OptimisticLockingRetryAdvisor;
import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
@@ -42,8 +41,6 @@ public class GenericServiceServer extends HttpInvokerServiceExporter
{
setServiceInterface(IGenericServer.class);
setService(server);
- setInterceptors(new Object[]
- { new OptimisticLockingRetryAdvisor() });
super.afterPropertiesSet();
}
--
GitLab