From f35d290de909a76d609a910ed60d40dbf6aa19dc Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Fri, 11 May 2012 15:39:46 +0000
Subject: [PATCH] SP-45, BIS-21 add missing pre-registration error
SVN: 25245
---
.../ConfiguredOnErrorActionDecision.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecision.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecision.java
index 062a6722b88..2778b233035 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecision.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecision.java
@@ -42,6 +42,8 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
public static final String POST_REGISTRATION_ERROR_KEY = "post-registration-error";
+ public static final String PRE_REGISTRATION_ERROR_KEY = "pre-registration-error";
+
private final UnstoreDataAction invalidDataSetAction;
private final UnstoreDataAction validationScriptError;
@@ -54,6 +56,8 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
private final UnstoreDataAction postRegistrationError;
+ private final UnstoreDataAction preRegistrationError;
+
public ConfiguredOnErrorActionDecision(Properties properties)
{
invalidDataSetAction = getAction(ErrorType.INVALID_DATA_SET, properties);
@@ -62,7 +66,8 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
registrationScriptError = getAction(ErrorType.REGISTRATION_SCRIPT_ERROR, properties);
storageProcessorError = getAction(ErrorType.STORAGE_PROCESSOR_ERROR, properties);
postRegistrationError = getAction(ErrorType.POST_REGISTRATION_ERROR, properties);
- }
+ preRegistrationError = getAction(ErrorType.PRE_REGISTRATION_ERROR, properties);
+ }
public UnstoreDataAction computeUndoAction(ErrorType errorType, Throwable failureOrNull)
{
@@ -87,6 +92,9 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
case POST_REGISTRATION_ERROR:
action = postRegistrationError;
break;
+ case PRE_REGISTRATION_ERROR:
+ action = preRegistrationError;
+ break;
}
return action;
@@ -115,6 +123,9 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
case POST_REGISTRATION_ERROR:
actionStringKey = POST_REGISTRATION_ERROR_KEY;
break;
+ case PRE_REGISTRATION_ERROR:
+ actionStringKey = PRE_REGISTRATION_ERROR_KEY;
+ break;
}
String actionString = PropertyUtils.getProperty(properties, actionStringKey);
@@ -146,7 +157,9 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
case STORAGE_PROCESSOR_ERROR:
case VALIDATION_SCRIPT_ERROR:
case POST_REGISTRATION_ERROR:
- action = UnstoreDataAction.LEAVE_UNTOUCHED;
+ case PRE_REGISTRATION_ERROR:
+ action = UnstoreDataAction.LEAVE_UNTOUCHED;
+ break;
}
return action;
--
GitLab