From e7f92afafb349b3eee4fa1c2c97fb88c2ef7988e Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 19 Sep 2012 14:58:13 +0000
Subject: [PATCH] BIS-195 add missing call to unset service converstation from
perform entity operations
SVN: 26684
---
.../ch/systemsx/cisd/openbis/generic/server/ETLService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index 4d9ce432024..f5107671b44 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -54,6 +54,7 @@ import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationServic
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ReturnValueFilter;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed;
+import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.AbstractTechIdPredicate.ExperimentTechIdPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.AtomicOperationsPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.DataSetCodeCollectionPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.DataSetCodePredicate;
@@ -69,7 +70,6 @@ import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SampleOwn
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SampleTechIdPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SampleUpdatesPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SpaceIdentifierPredicate;
-import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.AbstractTechIdPredicate.ExperimentTechIdPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.validator.ProjectValidator;
import ch.systemsx.cisd.openbis.generic.server.authorization.validator.SampleValidator;
import ch.systemsx.cisd.openbis.generic.server.batch.BatchOperationExecutor;
@@ -1502,6 +1502,8 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
samplesCreated, samplesUpdated, dataSetsCreated, dataSetsUpdated);
} finally
{
+ ServiceConversationsThreadContext.unsetProgressListener();
+
EntityOperationsInProgress.getInstance().removeRegistrationPending(registrationId);
if (sessionTokenForEntityOperation != null)
{
--
GitLab