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/01/14 20:09:52 UTC
svn commit: r1231564 - in /lucene/dev/trunk/solr: CHANGES.txt
solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
Author: yonik
Date: Sat Jan 14 19:09:52 2012
New Revision: 1231564
URL: http://svn.apache.org/viewvc?rev=1231564&view=rev
Log:
SOLR-3037: When using binary format in solrj the codec screws up parameters
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1231564&r1=1231563&r2=1231564&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jan 14 19:09:52 2012
@@ -294,6 +294,10 @@ Bug Fixes
* SOLR-1520: QueryElevationComponent now supports non-string ids (gsingers)
+* SOLR-3037: When using binary format in solrj the codec screws up parameters
+ (Sami Siren via yonik)
+
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=1231564&r1=1231563&r2=1231564&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java Sat Jan 14 19:09:52 2012
@@ -195,7 +195,9 @@ public class JavaBinUpdateRequestCodec {
NamedList nl = new NamedList();
while (it.hasNext()) {
String s = it.next();
- nl.add(s, params.getParams(s));
+ for(String val: params.getParams(s)) {
+ nl.add(s, val);
+ }
}
return nl;
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=1231564&r1=1231563&r2=1231564&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java Sat Jan 14 19:09:52 2012
@@ -50,7 +50,7 @@ public class TestUpdateRequestCodec exte
updateRequest.deleteById("id:5");
updateRequest.deleteByQuery("2*");
updateRequest.deleteByQuery("1*");
-
+ updateRequest.setParam("a", "b");
SolrInputDocument doc = new SolrInputDocument();
doc.addField("id", 1);
doc.addField("desc", "one", 2.0f);
@@ -106,6 +106,7 @@ public class TestUpdateRequestCodec exte
Assert.assertEquals(updateUnmarshalled.getDeleteQuery().get(0) ,
updateRequest.getDeleteQuery().get(0));
+ assertEquals("b", updateUnmarshalled.getParams().get("a"));
}
@Test