diff options
Diffstat (limited to 'id/ConfigWebTool/src')
| -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); |