Skip to content
Snippets Groups Projects
Commit 6956ddcd authored by gnaegi's avatar gnaegi
Browse files

Merge with 0d0a1f1d10193c589688eb858d3a032e60ef0fa3

parents cb69ef08 186491d0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/olat/admin/user/imp/UserImportController.java
+ 1
− 1
View file @ 6956ddcd
...@@ -171,7 +171,7 @@ public class UserImportController extends BasicController { ...@@ -171,7 +171,7 @@ public class UserImportController extends BasicController {
newUser.getPreferences().setInformSessionTimeout(true); newUser.getPreferences().setInformSessionTimeout(true);
// Save everything in database // Save everything in database
Identity ident; Identity ident;
if(pwd.startsWith(SHIBBOLETH_MARKER) && ShibbolethModule.isEnableShibbolethLogins()) { if(pwd != null && pwd.startsWith(SHIBBOLETH_MARKER) && ShibbolethModule.isEnableShibbolethLogins()) {
String uniqueID = pwd.substring(SHIBBOLETH_MARKER.length()); String uniqueID = pwd.substring(SHIBBOLETH_MARKER.length());
ident = AuthHelper.createAndPersistIdentityAndUserWithUserGroup(login, ShibbolethDispatcher.PROVIDER_SHIB, uniqueID, newUser); ident = AuthHelper.createAndPersistIdentityAndUserWithUserGroup(login, ShibbolethDispatcher.PROVIDER_SHIB, uniqueID, newUser);
report.incrementCreatedUser(); report.incrementCreatedUser();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment