You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2013/05/21 19:26:13 UTC

svn commit: r1484879 - in /lucene/dev/branches/branch_4x/solr: CHANGES.txt core/src/java/org/apache/solr/request/SimpleFacets.java

Author: ehatcher
Date: Tue May 21 17:26:13 2013
New Revision: 1484879

URL: http://svn.apache.org/r1484879
Log:
SOLR-4842: add in additional fix from hossman

Modified:
    lucene/dev/branches/branch_4x/solr/CHANGES.txt
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1484879&r1=1484878&r2=1484879&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue May 21 17:26:13 2013
@@ -79,7 +79,7 @@ Bug Fixes
   new style solr.xml
 
 * SOLR-4842: Fix facet.field local params from affecting other facet.field's.
-  (ehatcher)
+  (ehatcher, hossman)
 
 Other Changes
 ----------------------

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1484879&r1=1484878&r2=1484879&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Tue May 21 17:26:13 2013
@@ -150,6 +150,7 @@ public class SimpleFacets {
 
     if (localParams == null) {
       params = orig;
+      required = new RequiredSolrParams(params);
       return;
     }
     params = SolrParams.wrapDefaults(localParams, orig);