diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-09-15 12:55:30 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-09-15 12:55:30 +0200 |
| commit | fa3f73a46151d06c4f80eb0c43d3eda6c23c3709 (patch) | |
| tree | ea5567192489a16d7dbd24a62f3f9512df76f489 /id/ConfigWebTool/src/main | |
| parent | 76bae60e9bda1acb7ee0e3d45ab187749d16bf82 (diff) | |
| download | moa-id-spss-fa3f73a46151d06c4f80eb0c43d3eda6c23c3709.tar.gz moa-id-spss-fa3f73a46151d06c4f80eb0c43d3eda6c23c3709.tar.bz2 moa-id-spss-fa3f73a46151d06c4f80eb0c43d3eda6c23c3709.zip | |
fix problems with OracleDB and configuration storage implementation
Diffstat (limited to 'id/ConfigWebTool/src/main')
2 files changed, 12 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java index 849e81967..e2a55db60 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java @@ -188,6 +188,13 @@ public class ConfigurationProvider { /** + * @return the props + */ + public Properties getConfigurationProperties() { + return props; + } + + /** * @return the deprecatedDBWrite */ public FileBasedUserConfiguration getUserManagement() { diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java index 18452ed2d..35b69274f 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java @@ -76,7 +76,11 @@ public class OAPVP2ConfigValidation { else { try { - Map<String, String> oa = ConfigurationProvider.getInstance().getDbRead().getOnlineApplicationKeyValueWithId(oaID); + //OracleDB does not allow the selection of a lob in SQL where expression + String dbDriver = ConfigurationProvider.getInstance().getConfigurationProperties().getProperty("hibernate.connection.driver_class"); + boolean backupVersion = MiscUtil.isNotEmpty(dbDriver) && dbDriver.startsWith("oracle.jdbc."); + + Map<String, String> oa = ConfigurationProvider.getInstance().getDbRead().getOnlineApplicationKeyValueWithId(oaID, backupVersion); if (oa != null && MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.SERVICE_PROTOCOLS_PVP2X_CERTIFICATE))) { certSerialized = Base64Utils.decode(oa.get(MOAIDConfigurationConstants.SERVICE_PROTOCOLS_PVP2X_CERTIFICATE), false); |