From 61859c9367b0384fafed59f0a2c8a849712ced99 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 18 Sep 2012 15:16:35 +0200
Subject: [PATCH] OO-291: fix NPE in import wizard of member in a group/course
---
.../java/org/olat/course/member/EditMembershipController.java | 4 ++--
.../course/member/wizard/_i18n/LocalStrings_de.properties | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/course/member/EditMembershipController.java b/src/main/java/org/olat/course/member/EditMembershipController.java
index 98b264cd55e..11e492a126d 100644
--- a/src/main/java/org/olat/course/member/EditMembershipController.java
+++ b/src/main/java/org/olat/course/member/EditMembershipController.java
@@ -121,7 +121,7 @@ public class EditMembershipController extends FormBasicController {
super(ureq, wControl, "edit_member");
this.member = null;
- this.members = new ArrayList<Identity>(members);
+ this.members = (members == null ? null : new ArrayList<Identity>(members));
this.repoEntry = repoEntry;
this.withButtons = true;
repositoryManager = CoreSpringFactory.getImpl(RepositoryManager.class);
@@ -138,7 +138,7 @@ public class EditMembershipController extends FormBasicController {
super(ureq, wControl, LAYOUT_CUSTOM, "edit_member", rootForm);
this.member = null;
- this.members = new ArrayList<Identity>(members);
+ this.members = (members == null ? null : new ArrayList<Identity>(members));
this.repoEntry = repoEntry;
this.withButtons = false;
repositoryManager = CoreSpringFactory.getImpl(RepositoryManager.class);
diff --git a/src/main/java/org/olat/course/member/wizard/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/member/wizard/_i18n/LocalStrings_de.properties
index 08f1235c8f5..3e2cddd9e07 100644
--- a/src/main/java/org/olat/course/member/wizard/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/member/wizard/_i18n/LocalStrings_de.properties
@@ -3,5 +3,5 @@ import.import.title=Benutzernamen angeben
import.confirm.title=Überprüfen
import.permission.title=Berechtigungen
import.mail.title=E-Mail-Benachrichtigung
-form.names.example=aoi,kanu,
+form.names.example=test01<br/>author02<br/>
form.addusers=Benutzername
\ No newline at end of file
--
GitLab