summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hwang <simon.hwang@ericsson.com>2015-11-11 16:13:17 -0500
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2015-11-12 12:59:30 -0800
commitf214681aa9514bb31789be907429dd68d0b4da38 (patch)
treea7eebb84d13437ff74a11648196f81043e42c63e
parent1e329a13bfc67ec0b4784d59b6e426e9444093d9 (diff)
Display latest result of branch list screen's filter
Before the fix the branch list screen displays branches based on the filter but sometimes failed to display the latest result when filter is typed fast and server is slow enough. This change ensures that the branch list screen always displays the latest result of the filter. Change-Id: Iea902adea7f5e9753a54e140ebc0cbfff1f12239
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
index c5f7225b04..3b3a6fcba3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
@@ -258,8 +258,10 @@ public class ProjectBranchesScreen extends ProjectScreen {
Query q = new Query(filterTxt.getValue());
if (match.equals(q.qMatch)) {
q.start(start);
- } else if (query == null) {
- q.run();
+ } else {
+ if (query == null) {
+ q.run();
+ }
query = q;
}
}