Author: bleny Date: 2010-12-21 09:51:09 +0000 (Tue, 21 Dec 2010) New Revision: 842 Log: code style Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-12-21 09:50:46 UTC (rev 841) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-12-21 09:51:09 UTC (rev 842) @@ -430,25 +430,11 @@ } } - WaoUserDAO dao = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser userToDelete = dao.findByTopiaId(user.getTopiaId()); + WaoUserDAO dao = WaoDAOHelper.getWaoUserDAO(transaction); + WaoUser userToDelete = dao.findByTopiaId(user.getTopiaId()); + dao.delete(userToDelete); + transaction.commitTransaction(); -/* //userToDelete.clearUserProfile(); - - // userToDelete.setUserProfile(null); - - // remove all profiles - UserProfileDAO userProfileDAO = WaoDAOHelper.getUserProfileDAO(transaction); - Collection<UserProfile> userProfileCollection = userToDelete.getUserProfile(); - if (CollectionUtils.isNotEmpty(userProfileCollection)) { - for (UserProfile userProfile : userProfileCollection) { - // userProfileDAO.delete(userProfile); - } - }*/ - - dao.delete(userToDelete); - transaction.commitTransaction(); - } @Override