You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by yo...@apache.org on 2012/02/28 00:48:22 UTC

svn commit: r1294400 - /lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java

Author: yonik
Date: Mon Feb 27 23:48:22 2012
New Revision: 1294400

URL: http://svn.apache.org/viewvc?rev=1294400&view=rev
Log:
SOLR-3170: don't use default params

Modified:
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java?rev=1294400&r1=1294399&r2=1294400&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java Mon Feb 27 23:48:22 2012
@@ -268,11 +268,13 @@ public class CommonsHttpSolrServer exten
     }
     
     // The parser 'wt=' and 'version=' params are used instead of the original params
-    ModifiableSolrParams wparams = new ModifiableSolrParams();
+    ModifiableSolrParams wparams = new ModifiableSolrParams(params);
     wparams.set( CommonParams.WT, parser.getWriterType() );
     wparams.set( CommonParams.VERSION, parser.getVersion());
-    params = SolrParams.wrapDefaults(wparams, params);
-    params = SolrParams.wrapDefaults(_invariantParams, params);
+    if (_invariantParams != null) {
+      wparams.add( _invariantParams );
+    }
+    params = wparams;
 
     int tries = _maxRetries + 1;
     try {