Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

failOnVersionConflicts param should be added to the DistributedUpdateProcessor whitelist params (#1173)

Justin Sweeney29dbb3ec178b
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
index 1a796fd9bd6..7b1d1d858cb 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
@@ -196,7 +196,8 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
UpdateParams.OPTIMIZE,
UpdateParams.MAX_OPTIMIZE_SEGMENTS,
UpdateParams.REQUIRE_PARTIAL_DOC_UPDATES_INPLACE,
- ShardParams._ROUTE_);
+ ShardParams._ROUTE_,
+ CommonParams.FAIL_ON_VERSION_CONFLICTS);
// this.rsp = reqInfo != null ? reqInfo.getRsp() : null;
}