diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-06-02 07:57:35 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-06-02 07:57:35 +0200 |
| commit | 25c06eaa567f0023771747b3824571abdbb7b4c7 (patch) | |
| tree | c5fe22c532cf3f16cbf8839fee3ad7b532481852 /id/ConfigWebTool/src/main/java/at | |
| parent | e9407ea4eddba35181953b9a9583ccbc5dd691a7 (diff) | |
| download | moa-id-spss-MOA-ID-2.1-RC1.tar.gz moa-id-spss-MOA-ID-2.1-RC1.tar.bz2 moa-id-spss-MOA-ID-2.1-RC1.zip | |
moa-id-configuration bku-selection preview problem solvedMOA-ID-2.1-RC1
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java index 363c094ff..45875010b 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java @@ -109,18 +109,23 @@ public class OASTORKConfig implements IOnlineApplicationData{ // prepare attribute helper list attributes = new ArrayList<AttributeHelper>(); try { - for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) { - AttributeHelper tmp = null; + try { + for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) { + AttributeHelper tmp = null; - for(OAStorkAttribute sepp : config.getOAAttributes()) - if(sepp.getName().equals(current.getName())) - tmp = new AttributeHelper(sepp); + for(OAStorkAttribute sepp : config.getOAAttributes()) + if(sepp.getName().equals(current.getName())) + tmp = new AttributeHelper(sepp); - if(null == tmp) - tmp = new AttributeHelper(current); + if(null == tmp) + tmp = new AttributeHelper(current); - attributes.add(tmp); - } + attributes.add(tmp); + } + + } catch (NullPointerException ex) { + + } // fetch vidp config if (config.isVidpEnabled() != null) @@ -138,7 +143,7 @@ public class OASTORKConfig implements IOnlineApplicationData{ // TODO this is a dirty hack since we have to have one entry to // clone from in the web form. Happens when time is short. // Sorry. - if (attributeProviderPlugins.isEmpty()) + if (attributeProviderPlugins == null || attributeProviderPlugins.isEmpty()) attributeProviderPlugins.add(new AttributeProviderPlugin()); } catch (NullPointerException ex) { log.error("Nullpointerexception encountered in Configurationinterface", ex); |