From 7464d5360b50ddabf6d8d61334dc8a54f1c3d52b Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Mon, 27 Feb 2012 23:48:22 +0000
Subject: [PATCH] SOLR-3170: don't use default params

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1294400 13f79535-47bb-0310-9956-ffa450edef68
---
 .../solr/client/solrj/impl/CommonsHttpSolrServer.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
index 44d9d0e9196..8bca39e99ae 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
@@ -268,11 +268,13 @@ public class CommonsHttpSolrServer extends SolrServer
     }
     
     // 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 {