aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-05-26 14:47:36 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-05-26 14:47:36 +0200
commit54144b697bd1a5c4b08e8da9fec655afd949446c (patch)
treeb3a02bf7013e18f51d1aa012d241003bc5cfa5ef /id/server/idserverlib/src/main/java
parent1c5fbb27d5d3b143bfa47153efd245b1270ba951 (diff)
downloadmoa-id-spss-54144b697bd1a5c4b08e8da9fec655afd949446c.tar.gz
moa-id-spss-54144b697bd1a5c4b08e8da9fec655afd949446c.tar.bz2
moa-id-spss-54144b697bd1a5c4b08e8da9fec655afd949446c.zip
fix different STORK bugs
Diffstat (limited to 'id/server/idserverlib/src/main/java')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java5
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);
}