diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-10-27 11:54:58 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-10-27 11:54:58 +0100 |
| commit | 2d3a2e41dccd4e5d5a3786b5dbbdce8dd8c3c214 (patch) | |
| tree | a29561f78e67d0d7834c2b58aaa9a9fdbf712dd2 /id/ConfigWebTool/src/main/java/at/gv | |
| parent | 8041cc0b0a238da8b34b0b5fc716b765952df0a0 (diff) | |
| download | moa-id-spss-2d3a2e41dccd4e5d5a3786b5dbbdce8dd8c3c214.tar.gz moa-id-spss-2d3a2e41dccd4e5d5a3786b5dbbdce8dd8c3c214.tar.bz2 moa-id-spss-2d3a2e41dccd4e5d5a3786b5dbbdce8dd8c3c214.zip | |
fix possible problem if no BKU is configurated in general configuration
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java index 725a2eded..a658c3f34 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java @@ -175,19 +175,16 @@ public class EditGeneralConfigAction extends BasicAction { } } - - - - String error = saveFormToDatabase(); - - session.setAttribute(Constants.SESSION_SLTRANSFORMATION, null); - + + String error = saveFormToDatabase(); if (error != null) { log.warn("General MOA-ID config can not be stored in Database"); addActionError(error); - return Constants.STRUTS_SUCCESS; + return Constants.STRUTS_ERROR_VALIDATION; } + session.setAttribute(Constants.SESSION_SLTRANSFORMATION, null); + } else { addActionError(LanguageHelper.getErrorString("errors.notallowed", request)); return Constants.STRUTS_NOTALLOWED; @@ -478,12 +475,18 @@ public class EditGeneralConfigAction extends BasicAction { if (MiscUtil.isNotEmpty(moaconfig.getDefaultBKUHandy())) dbbkus.setHandyBKU(moaconfig.getDefaultBKUHandy()); + else + dbbkus.setHandyBKU(new String()); if (MiscUtil.isNotEmpty(moaconfig.getDefaultBKUOnline())) dbbkus.setOnlineBKU(moaconfig.getDefaultBKUOnline()); + else + dbbkus.setOnlineBKU(new String()); if (MiscUtil.isNotEmpty(moaconfig.getDefaultBKULocal())) dbbkus.setLocalBKU(moaconfig.getDefaultBKULocal()); + else + dbbkus.setLocalBKU(new String()); ChainingModes dbchainingmodes = dbconfig.getChainingModes(); if (dbchainingmodes == null) { |