You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/02/01 22:15:33 UTC
svn commit: r1239327 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/analyzers/kuromoji/ solr/ solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/core/SolrCore.java
solr/core/src/test-files/solr/conf/solrconfig.xml
Author: hossman
Date: Wed Feb 1 21:15:32 2012
New Revision: 1239327
URL: http://svn.apache.org/viewvc?rev=1239327&view=rev
Log:
SOLR-3084: Fixed initialiazation error when using <queryResponseWriter default="true" ... /> (merge r1239316 from trunk)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/ (props changed)
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1239327&r1=1239326&r2=1239327&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Wed Feb 1 21:15:32 2012
@@ -180,6 +180,10 @@ Bug Fixes
* SOLR-3073: Fixed 'Invalid UUID string' error when having an UUID field as
the unique key and executing a distributed grouping request. (Devon Krisman, Martijn van Groningen)
+* SOLR-3084: Fixed initialiazation error when using
+ <queryResponseWriter default="true" ... /> (Bernd Fehling and hossman)
+
+
Other Changes
----------------------
* SOLR-2922: Upgrade commons-io and commons-lang to 2.1 and 2.6, respectively. (koji)
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1239327&r1=1239326&r2=1239327&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/core/SolrCore.java Wed Feb 1 21:15:32 2012
@@ -1489,9 +1489,9 @@ public final class SolrCore implements S
log.warn("Multiple queryResponseWriter registered to the same name: " + info.name + " ignoring: " + old.getClass().getName());
}
if(info.isDefault()){
- defaultResponseWriter = writer;
if(defaultResponseWriter != null)
- log.warn("Multiple default queryResponseWriter registered ignoring: " + old.getClass().getName());
+ log.warn("Multiple default queryResponseWriter registered, using: " + info.name);
+ defaultResponseWriter = writer;
}
log.info("created "+info.name+": " + info.className);
} catch (Exception ex) {
Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml?rev=1239327&r1=1239326&r2=1239327&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml Wed Feb 1 21:15:32 2012
@@ -234,7 +234,9 @@
</query>
-
+
+ <queryResponseWriter name="xml" default="true"
+ class="solr.XMLResponseWriter" />
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids).
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset