You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/02/05 11:15:56 UTC
lucene-solr git commit:
WrapperMergePolicyFactory.filterWrappedMergePolicyFactoryArgs can do
args.remove instead of args.get-and-then-if-found-remove for WRAPPED_PREFIX
Repository: lucene-solr
Updated Branches:
refs/heads/master-solr-8621 e0730d3be -> e0a99af35
WrapperMergePolicyFactory.filterWrappedMergePolicyFactoryArgs can do args.remove instead of args.get-and-then-if-found-remove for WRAPPED_PREFIX
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e0a99af3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e0a99af3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e0a99af3
Branch: refs/heads/master-solr-8621
Commit: e0a99af353058e26ad883c9d3b08e6593453ef07
Parents: e0730d3
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 5 10:15:00 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 5 10:15:00 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/solr/index/WrapperMergePolicyFactory.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e0a99af3/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java b/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
index bb72de8..0c9b949 100644
--- a/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
+++ b/solr/core/src/java/org/apache/solr/index/WrapperMergePolicyFactory.java
@@ -72,11 +72,9 @@ public abstract class WrapperMergePolicyFactory extends MergePolicyFactory {
* args from this instance's args.
*/
private MergePolicyFactoryArgs filterWrappedMergePolicyFactoryArgs() {
- final String wrappedPolicyPrefix = (String) args.get(WRAPPED_PREFIX);
+ final String wrappedPolicyPrefix = (String) args.remove(WRAPPED_PREFIX);
if (wrappedPolicyPrefix == null) {
return null;
- } else {
- args.remove(WRAPPED_PREFIX);
}
final String baseArgsPrefix = wrappedPolicyPrefix + '.';