Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== diff -u -rf429d1b9fef45cbe7a91454d563472f4ae036d09 -rbdeeffa3b5d1a3554aad9b8fdbcde9eaf3ed1aeb --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision f429d1b9fef45cbe7a91454d563472f4ae036d09) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision bdeeffa3b5d1a3554aad9b8fdbcde9eaf3ed1aeb) @@ -904,8 +904,8 @@ String[] learnerIdArray = (learnerIds != null) ? learnerIds.split(",") : new String[0]; String[] monitorIdArray = (monitorIds != null) ? monitorIds.split(",") : new String[0]; - String[] firstNameArray = (firstNames != null) ? firstNames.split(",") : new String[0]; - String[] lastNameArray = (lastNames != null) ? lastNames.split(",") : new String[0]; + String[] firstNameArray = (firstNames != null) ? firstNames.split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1) : new String[0]; + String[] lastNameArray = (lastNames != null) ? lastNames.split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1) : new String[0]; String[] emailArray = (emails != null) ? emails.split(",") : new String[0]; // in case there is firstNames available - check all arrays have the same length, as otherwise it's