Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -r950ee64939e4b71aec82daa0dce40ddfe554bff8 -r6feed3e3e5993eb7e64c026cc7673503dddb8854 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 950ee64939e4b71aec82daa0dce40ddfe554bff8) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 6feed3e3e5993eb7e64c026cc7673503dddb8854) @@ -80,20 +80,6 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#deleteOrganisation(org.lamsfoundation.lams.usermanagement.Organisation) - */ - public void delete(Organisation organisation) { - Iterator iter = organisation.getChildOrganisations().iterator(); - Organisation parentOrganisation = organisation.getParentOrganisation(); - while(iter.hasNext()){ - Organisation childOrganisation = (Organisation)iter.next(); - childOrganisation.setParentOrganisation(parentOrganisation); - iter.remove(); - } - delete(organisation); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#deleteOrganisationById(java.lang.Integer) */ public void deleteOrganisationById(Integer organisationId) {