aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons
diff options
context:
space:
mode:
authorChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2015-01-16 09:52:47 +0100
committerChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2015-01-16 09:52:47 +0100
commit24af302da6ab04a08c3a4af9dab9883394772324 (patch)
tree4eab94e836d461787fa8f91e5e0b3908e68977a7 /id/server/moa-id-commons
parent49112ff03a5c18b69ce212a4d88bb96d46e532d9 (diff)
parent6d242194721574b6f7284f8b705a518d2f39b36f (diff)
downloadmoa-id-spss-24af302da6ab04a08c3a4af9dab9883394772324.tar.gz
moa-id-spss-24af302da6ab04a08c3a4af9dab9883394772324.tar.bz2
moa-id-spss-24af302da6ab04a08c3a4af9dab9883394772324.zip
Merge branch 'during_authsource_refactoring' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into during_authsource_refactoring
Diffstat (limited to 'id/server/moa-id-commons')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
index a3f445fcf..6efdd6223 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
@@ -152,7 +152,7 @@ public class ConfigurationDBRead {
if (result.size() == 0) {
Logger.trace("No entries found. Create fresh instance.");
- return new MOAIDConfiguration();
+ return null;
}
return (MOAIDConfiguration) result.get(0);