Merge "Ensure constants are declared as immutable collections"
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
index c7d9916..5c3183a 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
@@ -14,6 +14,7 @@
package com.google.gerrit.lucene;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import com.google.common.base.Joiner;
@@ -288,7 +289,8 @@
reopenThread.waitForGeneration(gen, 0);
return new NrtFuture(gen);
}
- });
+ },
+ directExecutor());
}
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java
index 2b39d09..2f6f898 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java
@@ -14,6 +14,7 @@
package com.google.gerrit.server.index.change;
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static com.google.gerrit.server.query.change.ChangeData.asChanges;
import com.google.common.util.concurrent.FutureCallback;
@@ -92,7 +93,8 @@
public void onFailure(Throwable ignored) {
// Logged by {@link GetChanges#call()}.
}
- });
+ },
+ directExecutor());
}
private abstract class Task<V> implements Callable<V> {
diff --git a/polygerrit-ui/app/test/index.html b/polygerrit-ui/app/test/index.html
index e840686..0a20d33ed 100644
--- a/polygerrit-ui/app/test/index.html
+++ b/polygerrit-ui/app/test/index.html
@@ -110,6 +110,7 @@
// Behaviors tests.
[
+ 'gr-change-table-behavior/gr-change-table-behavior_test.html',
'gr-patch-set-behavior/gr-patch-set-behavior_test.html',
'gr-path-list-behavior/gr-path-list-behavior_test.html',
'gr-tooltip-behavior/gr-tooltip-behavior_test.html',
