lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yonik Seeley <yo...@lucidimagination.com>
Subject Re: svn commit: r1023520 - /lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
Date Sun, 17 Oct 2010 16:33:46 GMT
FYI, rather than spamming the list with backports, I'm going to start
batching my backports to the 3x branch.

All the svn:mergeinfo updates for even the smallest merge is a real
nightmare.  Merges to the 3x branch are practically unreadable since
the real update is lost in the noise.

-Yonik
http://www.lucidimagination.com


On Sun, Oct 17, 2010 at 12:28 PM,  <yonik@apache.org> wrote:
> Author: yonik
> Date: Sun Oct 17 16:28:37 2010
> New Revision: 1023520
>
> URL: http://svn.apache.org/viewvc?rev=1023520&view=rev
> Log:
> close the request we created
>
> Modified:
>    lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
>
> Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?rev=1023520&r1=1023519&r2=1023520&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
(original)
> +++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
Sun Oct 17 16:28:37 2010
> @@ -23,6 +23,7 @@ import org.apache.solr.common.params.Sol
>  import org.apache.solr.common.util.NamedList;
>  import org.apache.solr.common.util.XML;
>  import org.apache.solr.core.SolrCore;
> +import org.apache.solr.request.LocalSolrQueryRequest;
>  import org.apache.solr.request.SolrQueryRequest;
>  import org.apache.solr.request.SolrQueryRequestBase;
>  import org.apache.solr.response.SolrQueryResponse;
> @@ -117,15 +118,13 @@ public class XmlUpdateRequestHandler ext
>    */
>   @Deprecated
>   public void doLegacyUpdate(Reader input, Writer output) {
> -    try {
> -      SolrCore core = SolrCore.getSolrCore();
> +    SolrCore core = SolrCore.getSolrCore();
> +    SolrQueryRequest req = new LocalSolrQueryRequest(core, new HashMap<String,String[]>());
>
> +    try {
>       // Old style requests do not choose a custom handler
>       UpdateRequestProcessorChain processorFactory = core.getUpdateProcessingChain(null);
>
> -      SolrParams params = new MapSolrParams(new HashMap<String, String>());
> -      SolrQueryRequestBase req = new SolrQueryRequestBase(core, params) {
> -      };
>       SolrQueryResponse rsp = new SolrQueryResponse(); // ignored
>       XMLStreamReader parser = inputFactory.createXMLStreamReader(input);
>       UpdateRequestProcessor processor = processorFactory.createProcessor(req, rsp);
> @@ -142,6 +141,9 @@ public class XmlUpdateRequestHandler ext
>         log.error("Error writing to output stream: " + ee);
>       }
>     }
> +    finally {
> +      req.close();
> +    }
>   }
>   //////////////////////// SolrInfoMBeans methods //////////////////////
>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org


Mime
View raw message