Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.75 -r1.76 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 23 May 2007 00:51:44 -0000 1.75 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 14 Jun 2007 00:53:32 -0000 1.76 @@ -332,17 +332,20 @@ Organisation organisation = (Organisation)baseDAO.find(Organisation.class,organisationID); if (organisation != null) { - Iterator iterator = organisation.getUserOrganisations().iterator(); - while (iterator.hasNext()) { - UserOrganisation userOrganisation = (UserOrganisation) iterator.next(); - Iterator userOrganisationRoleIterator = userOrganisation.getUserOrganisationRoles().iterator(); - while (userOrganisationRoleIterator.hasNext()) { - UserOrganisationRole userOrganisationRole = (UserOrganisationRole) userOrganisationRoleIterator.next(); - if (userOrganisationRole.getRole().getName().equals(roleName)) - if(isFlashCall) - users.add(userOrganisation.getUser().getUserFlashDTO()); - else - users.add(userOrganisation.getUser().getUserDTO()); + Set uos = organisation.getUserOrganisations(); + if (uos != null) { + Iterator iterator = uos.iterator(); + while (iterator.hasNext()) { + UserOrganisation userOrganisation = (UserOrganisation) iterator.next(); + Iterator userOrganisationRoleIterator = userOrganisation.getUserOrganisationRoles().iterator(); + while (userOrganisationRoleIterator.hasNext()) { + UserOrganisationRole userOrganisationRole = (UserOrganisationRole) userOrganisationRoleIterator.next(); + if (userOrganisationRole.getRole().getName().equals(roleName)) + if(isFlashCall) + users.add(userOrganisation.getUser().getUserFlashDTO()); + else + users.add(userOrganisation.getUser().getUserDTO()); + } } } } @@ -482,6 +485,7 @@ Organisation pOrg = organisation.getParentOrganisation(); // set parent's child orgs Set children = pOrg.getChildOrganisations(); + if (children==null) children = new HashSet(); children.add(organisation); pOrg.setChildOrganisations(children); // get course managers and give them staff role in this new class