opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9' into stable-2.10

Browse Source 
* stable-2.9:
  Add full names for options on list groups REST API
  Add full names for options on list projects REST API
  Make `-S` an alias of `--start` in changes query REST API
  Mention deprecation of sortkey parameters in 2.9 release notes
  Run change hooks and ref-updated events after indexing is done.
  Fix broken formatting in changes REST documentation
  Restrict the input of plugin_archetype_deploy.sh
  Gracefully handle `buck audit` failure
  Revert "Make VisibleRefFilter.Filter reuse the refs passed from JGit."

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java
	gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
	tools/pack_war.py

Change-Id: I89a9b42c049ec1365ef6dec53c73c7a10a41e888
This commit is contained in:
David Pursehouse
2014-09-05 19:09:08 +09:00
parent 37da5858bb 538e87aaa6
commit b8eee7aae1
18 changed files with 126 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java
View File

@@ -15,7 +15,6 @@
package com.google.gerrit.server.change;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.DefaultInput;
@@ -123,11 +122,9 @@ class PutTopic implements RestModifyView<ChangeResource, Input>,
db.rollback();
}
update.commit();
CheckedFuture<?, IOException> indexFuture =
indexer.indexAsync(change.getId());
indexer.index(db, change);
hooks.doTopicChangedHook(change, currentUser.getAccount(),
oldTopicName, db);
indexFuture.checkedGet();
}
return Strings.isNullOrEmpty(newTopicName)
? Response.<String>none()