aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-06-17 14:29:15 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-06-17 14:29:15 +0200
commitf094c34d0bba76a93a5a69ddc0f9e4749554a4e8 (patch)
tree08dfc8c52ff06945cf22685035eaf49b60dc38fa
parentf3e6ddc7756275ce1800ff39b470a824c89a5978 (diff)
parent62636b77e84b881a7ea365c1868966935eaeff97 (diff)
downloadmoa-id-spss-f094c34d0bba76a93a5a69ddc0f9e4749554a4e8.tar.gz
moa-id-spss-f094c34d0bba76a93a5a69ddc0f9e4749554a4e8.tar.bz2
moa-id-spss-f094c34d0bba76a93a5a69ddc0f9e4749554a4e8.zip
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index f6360f4cf..cd3191755 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -409,10 +409,11 @@ public Map<String, String> getFormCustomizaten() {
*/
@Override
public Integer getQaaLevel() {
-
- if (oa_auth.getOASTORK() != null && oa_auth.getOASTORK().getQaa() != null)
+ if (oa_auth.getOASTORK() != null &&
+ oa_auth.getOASTORK().getQaa() != null &&
+ oa_auth.getOASTORK().getQaa() >= 1 &&
+ oa_auth.getOASTORK().getQaa() <= 4)
return oa_auth.getOASTORK().getQaa();
-
else
return 4;
}