From b1099d444c8a902a4f7db50980e04c10c4ed8ad1 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 15 Jul 2014 16:26:07 +0200
Subject: [PATCH] no-jira: fix after changes to wizard
---
.../java/org/olat/ldap/ui/LDAPAuthenticationController.java | 5 ++++-
.../java/org/olat/login/OLATAuthenticationController.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java b/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
index 6c8c16d3e78..0cfde5a48bd 100644
--- a/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
+++ b/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
@@ -44,6 +44,7 @@ import org.olat.core.id.Identity;
import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry;
import org.olat.core.logging.OLATRuntimeException;
+import org.olat.core.logging.OLATSecurityException;
import org.olat.core.util.StringHelper;
import org.olat.core.util.UserSession;
import org.olat.core.util.Util;
@@ -113,7 +114,9 @@ public class LDAPAuthenticationController extends AuthenticationController imple
protected void openChangePassword(UserRequest ureq, String initialEmail) {
// double-check if allowed first
- if (!UserModule.isPwdchangeallowed(ureq.getIdentity()) || !LDAPLoginModule.isPropagatePasswordChangedOnLdapServer())
+ if (!UserModule.isPwdchangeallowed(ureq.getIdentity()) || !LDAPLoginModule.isPropagatePasswordChangedOnLdapServer()) {
+ throw new OLATSecurityException("chose password to be changed, but disallowed by config");
+ }
removeAsListenerAndDispose(cmc);
removeAsListenerAndDispose(subController);
diff --git a/src/main/java/org/olat/login/OLATAuthenticationController.java b/src/main/java/org/olat/login/OLATAuthenticationController.java
index 0f1bcaba67a..f21dd1cb83a 100644
--- a/src/main/java/org/olat/login/OLATAuthenticationController.java
+++ b/src/main/java/org/olat/login/OLATAuthenticationController.java
@@ -151,7 +151,9 @@ public class OLATAuthenticationController extends AuthenticationController imple
protected void openChangePassword(UserRequest ureq, String initialEmail) {
// double-check if allowed first
- if (!UserModule.isPwdchangeallowed(ureq.getIdentity())) throw new OLATSecurityException("chose password to be changed, but disallowed by config");
+ if (!UserModule.isPwdchangeallowed(ureq.getIdentity())) {
+ throw new OLATSecurityException("chose password to be changed, but disallowed by config");
+ }
removeAsListenerAndDispose(cmc);
removeAsListenerAndDispose(subController);
--
GitLab