diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-31 15:27:47 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-31 15:27:47 +0200 |
commit | e833d0f16ba50ead4a72c1afebd08aad5bb50e35 (patch) | |
tree | abb6406598cfc63250636284e46a7b6ae142d046 /id/ConfigWebTool/src/main/java/at | |
parent | ae28423ee175ba248999b9d2d69152df0a1ee108 (diff) | |
download | moa-id-spss-e833d0f16ba50ead4a72c1afebd08aad5bb50e35.tar.gz moa-id-spss-e833d0f16ba50ead4a72c1afebd08aad5bb50e35.tar.bz2 moa-id-spss-e833d0f16ba50ead4a72c1afebd08aad5bb50e35.zip |
fix problem with configuration GUI and interfederation configurations
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/BasicOAAction.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java index 45674a283..e092d9e13 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java @@ -489,6 +489,21 @@ public class BasicOAAction extends BasicAction { log.debug("Find new hjID: " + hjID + " for service: " + oa.getPublicURLPrefix()); oa.setHjid(Long.valueOf(hjID)); + } else { + //TODO: work-around for old config tool and new key/value configuration + //see: NewConfigurationDBRead.java Line 81 + if (oa.getHjid() > 1000000) { + if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_GATEWAY)) + oa.setHjid(oa.getHjid() - 1000000); + else if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_IIDP)) + oa.setHjid(oa.getHjid() - 2000000); + else if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_VIDP)) + oa.setHjid(oa.getHjid() - 3000000); + else + log.warn("Inconsistent state found! Service Identifier for OA found but Hjid is > 1000000."); + + } + } Map<String, String> absolutKeyValue = KeyValueUtils.makeKeysAbsolut( |