aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/java/at
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-01-24 08:04:12 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-01-24 08:04:12 +0100
commit1f46df486fbab558fb3e935dfed160f26e698ac0 (patch)
tree43cef10cdba0c1bcbfb5b7658661ac4144063540 /id/ConfigWebTool/src/main/java/at
parent9eb81a78755db5c9735d2a43ee91fb11ce62e58e (diff)
downloadmoa-id-spss-1f46df486fbab558fb3e935dfed160f26e698ac0.tar.gz
moa-id-spss-1f46df486fbab558fb3e935dfed160f26e698ac0.tar.bz2
moa-id-spss-1f46df486fbab558fb3e935dfed160f26e698ac0.zip
-- Solve merge problems (AuthnRequestHandler.java & mandateReferenceValueAttributeBuilder)
-- Change sessionmanagement betweem AuthAction and TokenAction to AssertionStorage class -- add class definieten to HTML config element
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index 6b30c0cfa..e50515326 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -206,11 +206,8 @@ public class ConfigurationProvider {
}
public boolean isPVP2LoginActive() {
- if (!pvp2logininitialzied)
- return false;
-
- String result = props.getProperty("general.login.pvp2.isactive", "false");
- return Boolean.parseBoolean(result);
+
+ return Boolean.parseBoolean(props.getProperty("general.login.pvp2.isactive", "false"));
}
public boolean isPVP2LoginBusinessService() {