aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/java/at
diff options
context:
space:
mode:
authorAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-24 15:40:17 +0200
committerAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-24 15:40:17 +0200
commita36f28e84cd86196c8b750cbaa4f61977996aa6e (patch)
treefcf995faff5dd4bb08fdbe972f545c2b7aa4d61e /id/ConfigWebTool/src/main/java/at
parentbda377810ebe5467439d2098d683788ba4e7e602 (diff)
parent481963320bb314cd5b3fd459abe93f448bd677e9 (diff)
downloadmoa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.tar.gz
moa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.tar.bz2
moa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.zip
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java21
1 files changed, 12 insertions, 9 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 7f609d95e..a4ca3e403 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
@@ -222,15 +222,15 @@ public class EditGeneralConfigAction extends BasicAction {
private String saveFormToDatabase() {
log.debug("Saving form to database");
- log.error("Saving form to db");
- log.info("SV frm db");
+// log.error("Saving form to db");
+// log.info("SV frm db");
- for (Object obj : Collections.list(request.getParameterNames())) {
- log.error(" PARAM: " + obj.toString());
- }
- for (Object obj : Collections.list(request.getSession().getAttributeNames())) {
- log.error(" SES PARAM: " + obj.toString());
- }
+// for (Object obj : Collections.list(request.getParameterNames())) {
+// log.error(" PARAM: " + obj.toString());
+// }
+// for (Object obj : Collections.list(request.getSession().getAttributeNames())) {
+// log.error(" SES PARAM: " + obj.toString());
+// }
try {
log.error(" ASSERTION " + moaconfig.getTimeoutAssertion());
@@ -523,8 +523,11 @@ public class EditGeneralConfigAction extends BasicAction {
ForeignIdentities foreign = dbauth.getForeignIdentities();
if (foreign != null) {
STORK stork = foreign.getSTORK();
- if (stork == null)
+ if (stork == null) {
stork = new STORK();
+ foreign.setSTORK(stork);
+
+ }
try {
log.error("QAAAA " + storkconfig.getDefaultQaa());