opendev/gerrit
Code Issues Proposed changes

Fire missing onGitReferenceUpdated events

Browse Source 
A couple of places which invoked the doRefUpdatedHook missed to also
fire the onGitReferenceUpdated event.

Change-Id: Ifdefb492d43d844ec25e84d51f54701830cc4be7
This commit is contained in:
Saša Živkov
2015-11-11 10:03:30 -08:00
parent 40d64f6d43
commit 2b40937439
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
View File

@@ -36,6 +36,7 @@ import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.config.ProjectConfigEntry;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
@@ -89,6 +90,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
private final DynamicMap<RestView<ProjectResource>> views;
private final Provider<CurrentUser> user;
private final ChangeHooks hooks;
private final GitReferenceUpdated gitRefUpdated;
@Inject
PutConfig(@EnableSignedPush boolean serverEnableSignedPush,
@@ -102,6 +104,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
AllProjectsNameProvider allProjects,
DynamicMap<RestView<ProjectResource>> views,
ChangeHooks hooks,
GitReferenceUpdated gitRefUpdated,
Provider<CurrentUser> user) {
this.serverEnableSignedPush = serverEnableSignedPush;
this.metaDataUpdateFactory = metaDataUpdateFactory;
@@ -114,6 +117,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
this.allProjects = allProjects;
this.views = views;
this.hooks = hooks;
this.gitRefUpdated = gitRefUpdated;
this.user = user;
}
@@ -199,6 +203,8 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
ObjectId commitRev = projectConfig.commit(md);
// Only fire hook if project was actually changed.
if (!Objects.equals(baseRev, commitRev)) {
gitRefUpdated.fire(projectName, RefNames.REFS_CONFIG,
baseRev, commitRev);
hooks.doRefUpdatedHook(
new Branch.NameKey(projectName, RefNames.REFS_CONFIG),
baseRev, commitRev, user.get().asIdentifiedUser().getAccount());