diff options
| author | Klaus Stranacher <kstranacher@egiz.gv.at> | 2014-05-26 14:47:57 +0200 |
|---|---|---|
| committer | Klaus Stranacher <kstranacher@egiz.gv.at> | 2014-05-26 14:47:57 +0200 |
| commit | f814cccf898b02c3b897a4e3d4b95d928d1fb732 (patch) | |
| tree | 421e7f630aee439cc3d6df4393c4a8f4cdcc09d6 /id/server/idserverlib | |
| parent | f8bb5fa2b930d258d5c92733088bc1332159066a (diff) | |
| parent | 54144b697bd1a5c4b08e8da9fec655afd949446c (diff) | |
| download | moa-id-spss-f814cccf898b02c3b897a4e3d4b95d928d1fb732.tar.gz moa-id-spss-f814cccf898b02c3b897a4e3d4b95d928d1fb732.tar.bz2 moa-id-spss-f814cccf898b02c3b897a4e3d4b95d928d1fb732.zip | |
Merge branch 'moa-2.1-Snapshot' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa-2.1-Snapshot
Diffstat (limited to 'id/server/idserverlib')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java index 4dec2c32e..2e243b3ae 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java @@ -70,7 +70,8 @@ public class STORKConfig { try {
cpeps = stork.getCPEPS();
- } catch (NullPointerException ex) {
+
+ } catch (NullPointerException ex) {
Logger.error("CPEPS not configured!");
}
@@ -104,7 +105,7 @@ public class STORKConfig { }*/
}
attr = new ArrayList<StorkAttribute>();
- if (stork.getAttributes() != null) {
+ if (stork != null && stork.getAttributes() != null) {
for(StorkAttribute current : stork.getAttributes()) {
attr.add(current);
}
|