commit c41a0f5bb7e1756dbb2e725f94e0758ab0f867e5
author David Pursehouse <dpursehouse@collab.net> Fri Jun 08 13:28:15 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri Jun 08 14:14:59 2018 +0900
tree 0fbd6cc14e7851049fef98c0c34bc1fb8b66e42e
parent 132331a8af1e99abd63800b0bce598b5bfcbfaaa
parent a288c2e6c0c7bcd9295860bb583089a6a6389cec

Merge branch 'stable-2.15'

* stable-2.15:
  AbstractElasticIndex: fix index name of delete request and add coverage
  Bazel: Remove unused commons-lang3
  DropWizardMetricMaker: Move sanitizeMetricName to MetricMaker base class
  Update git submodules
  Update git submodules
  Update git submodules
  AsciiDoctor: Format with google-java-format version 1.6
  Enable metrics for core queues
  WorkQueue: Add possibility to enable metrics

Change I7af2f9f6c ("Bazel: Remove unused commons-lang3") is reverted by
this merge since commons-lang3 is actually still used on master.

This reverts commit 51c938d39c5933f6f9e717f260a3f25303398f00.

Change-Id: I5ea8c03d27e7eaefd0067658b25d1c08efdfd0f4

java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java

diff --git a/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
index b3a22bc..453712a 100644
--- a/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
+++ b/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
@@ -182,7 +182,7 @@
   protected abstract String getId(V v);
 
   protected String delete(String type, K id) {
-    return new DeleteRequest(id.toString(), indexNameRaw, type).toString();
+    return new DeleteRequest(id.toString(), indexName, type).toString();
   }
 
   protected abstract V fromDocument(JsonObject doc, Set<String> fields);