Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 13:35:44 +01:00
Code Issues Packages Projects Releases Activity

merge with branch 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-01-12 19:50:39 +01:00
parent 5332ac2466 b5aaf1ca4e
commit bad99919f4
250 changed files with 16399 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
View File

@@ -208,15 +208,14 @@ public class DefaultGroupManager extends AbstractGroupManager
String name = group.getName();
GroupPermissions.modify().check(name);
Group oldGroup = groupDAO.get(name);
if (oldGroup != null)
Group notModified = groupDAO.get(name);
if (notModified != null)
{
removeDuplicateMembers(group);
fireEvent(HandlerEventType.BEFORE_MODIFY, group, notModified);
group.setLastModified(System.currentTimeMillis());
fireEvent(HandlerEventType.BEFORE_MODIFY, group, oldGroup);
groupDAO.modify(group);
fireEvent(HandlerEventType.MODIFY, group, oldGroup);
fireEvent(HandlerEventType.MODIFY, group, notModified);
}
else
{