diff options
author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-08 10:55:12 +0200 |
---|---|---|
committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-08 10:55:12 +0200 |
commit | 487db6041f9c215e7d6cb93ed1d5b93ebb607ee3 (patch) | |
tree | c9302a52902d025c48105a87c9f43d5c2793bf92 /id/server/moa-id-commons/src/main/java/at/gv | |
parent | 9d07e7a6dcd66c0ebff241e4f0113b787fcbcffb (diff) | |
parent | 49daddb4b7296311aa68fc717dfcb35005e16b3e (diff) | |
download | moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.gz moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.bz2 moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.zip |
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
Diffstat (limited to 'id/server/moa-id-commons/src/main/java/at/gv')
2 files changed, 3 insertions, 3 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 88220cded..e890e2145 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 @@ -147,8 +147,8 @@ public class ConfigurationDBRead { Logger.trace("Found entries: " + result.size()); if (result.size() == 0) { - Logger.trace("No entries found."); - return null; + Logger.trace("No entries found. Create fresh instance."); + return new MOAIDConfiguration(); } return (MOAIDConfiguration) result.get(0); diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java index 6bd987f96..cdb19340d 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java @@ -154,7 +154,7 @@ public final class ConfigurationDBUtils { synchronized (session) { tx.begin(); - session.persist(dbo); + session.merge(dbo); tx.commit(); //session.clear(); |