svn commit: r1023599 - /lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java

[yo...@apache.org]

Author: yonik
Date: Sun Oct 17 23:52:21 2010
New Revision: 1023599

URL: http://svn.apache.org/viewvc?rev=1023599&view=rev
Log:
close request even if exception

Modified:
    lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java

Modified: lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=1023599&r1=1023598&r2=1023599&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java Sun Oct 17 23:52:21 2010
@@ -143,8 +143,9 @@ public class EmbeddedSolrServer extends 
       throw new SolrException( SolrException.ErrorCode.BAD_REQUEST, "unknown handler: "+path );
     }
 
+    SolrQueryRequest req = null;
     try {
-      SolrQueryRequest req = _parser.buildRequestFrom( core, params, request.getContentStreams() );
+      req = _parser.buildRequestFrom( core, params, request.getContentStreams() );
       req.getContext().put( "path", path );
       SolrQueryResponse rsp = new SolrQueryResponse();
       core.execute( handler, req, rsp );
@@ -216,14 +217,10 @@ public class EmbeddedSolrServer extends 
         catch (Exception ex) {
           throw new RuntimeException(ex);
         }
-        finally {
-          req.close();
-        }
       }
       
       // Now write it out
       NamedList<Object> normalized = getParsedResponse(req, rsp);
-      req.close();
       return normalized;
     }
     catch( IOException iox ) {
@@ -233,6 +230,7 @@ public class EmbeddedSolrServer extends 
       throw new SolrServerException( ex );
     }
     finally {
+      if (req != null) req.close();
       core.close();
     }
   }