From 137e2f343f9c8a7258aa32b0ec00a8cf03d2ba3e Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 15 Mar 2011 20:41:10 +0000
Subject: [PATCH] minor refactoring
SVN: 20344
---
.../registrator/JythonTopLevelDataSetHandler.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
index 67cd6aa2d77..62e26faf820 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
@@ -192,6 +192,14 @@ public class JythonTopLevelDataSetHandler<T extends DataSetInformation> extends
public void rollbackTransaction(DataSetRegistrationService<T> service,
DataSetRegistrationTransaction<T> transaction,
DataSetStorageAlgorithmRunner<T> algorithmRunner, Throwable ex)
+ {
+ invokeRollbackTransactionFunction(service, transaction, algorithmRunner, ex);
+ super.rollbackTransaction(service, transaction, algorithmRunner, ex);
+ }
+
+ private void invokeRollbackTransactionFunction(DataSetRegistrationService<T> service,
+ DataSetRegistrationTransaction<T> transaction,
+ DataSetStorageAlgorithmRunner<T> algorithmRunner, Throwable ex)
{
PythonInterpreter interpreter = getInterpreterFromService(service);
PyFunction function = tryJythonFunction(interpreter, ROLLBACK_TRANSACTION_FUNCTION_NAME);
@@ -199,8 +207,6 @@ public class JythonTopLevelDataSetHandler<T extends DataSetInformation> extends
{
invokeRollbackTransactionFunction(function, service, transaction, algorithmRunner, ex);
}
-
- super.rollbackTransaction(service, transaction, algorithmRunner, ex);
}
private PyFunction tryJythonFunction(PythonInterpreter interpreter, String functionName)
--
GitLab