From 166f1fe408da4ca926519ee8189d14cf774b1599 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Mon, 23 May 2011 11:55:06 +0000
Subject: [PATCH] LMS-2196 Fix initialization of the rollback configuration and
 added dump of the execption when possible.

SVN: 21430
---
 .../AbstractOmniscientTopLevelDataSetRegistrator.java           | 2 +-
 .../cisd/etlserver/registrator/DataSetRegistrationService.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
index 14304a6f1d1..4516b989e6e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -222,7 +222,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
 
         Properties onErrorDecisionProperties =
                 ExtendedProperties.getSubset(globalState.getThreadParameters()
-                        .getThreadProperties(), ON_ERROR_DECISION_KEY, true);
+                        .getThreadProperties(), ON_ERROR_DECISION_KEY + ".", true);
         IDataSetOnErrorActionDecision onErrorDecision =
                 ClassUtils.create(
                         IDataSetOnErrorActionDecision.class,
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
index f5401bb585f..4753e74b438 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
@@ -198,7 +198,7 @@ public class DataSetRegistrationService<T extends DataSetInformation> implements
                     registratorContext.getOnErrorActionDecision().computeUndoAction(errorType, ex);
             DataSetStorageRollbacker rollbacker =
                     new DataSetStorageRollbacker(registratorContext, operationLog, action,
-                            incomingDataSetFile, null, null, errorType);
+                            incomingDataSetFile, null, ex, errorType);
             operationLog.info(rollbacker.getErrorMessageForLog());
             rollbacker.doRollback();
         }
-- 
GitLab