SOLR-3487: handle named lists in xml response

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1342553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sami Siren 2012-05-25 09:57:46 +00:00
parent 0cbc7ec4e7
commit fc48a07bfb
2 changed files with 57 additions and 2 deletions

View File

@ -414,8 +414,12 @@ public class XMLResponseParser extends ResponseParser
doc.addField( name, val );
}
depth--; // the array reading clears out the 'endElement'
}
else if( !type.isLeaf ) {
} else if( type == KnownType.LST ) {
doc.addField( name, readNamedList( parser ) );
depth--;
} else if( !type.isLeaf ) {
System.out.println("nbot leaf!:" + type);
throw new XMLStreamException( "must be value or array", parser.getLocation() );
}
break;

View File

@ -0,0 +1,51 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.client.solrj;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.client.solrj.request.RequestWriter;
import org.apache.solr.util.ExternalPaths;
import org.junit.BeforeClass;
/**
* A subclass of SolrExampleTests that explicitly uses the xml codec for
* communication.
*/
public class SolrExampleXMLTest extends SolrExampleTests {
@BeforeClass
public static void beforeTest() throws Exception {
createJetty(ExternalPaths.EXAMPLE_HOME, null, null);
}
@Override
public SolrServer createNewSolrServer() {
try {
String url = "http://localhost:" + port + context;
HttpSolrServer s = new HttpSolrServer(url);
s.setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);
s.setDefaultMaxConnectionsPerHost(100);
s.setMaxTotalConnections(100);
s.setParser(new XMLResponseParser());
s.setRequestWriter(new RequestWriter());
return s;
} catch (Exception ex) {
throw new RuntimeException(ex);
}
}
}