svn commit: r1022790 - /lucene/dev/trunk/solr/src/java/org/apache/solr/util/TestHarness.java

[yo...@apache.org]

Author: yonik
Date: Fri Oct 15 00:42:46 2010
New Revision: 1022790

URL: http://svn.apache.org/viewvc?rev=1022790&view=rev
Log:
tests: close request in a finally block

Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/util/TestHarness.java

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/util/TestHarness.java?rev=1022790&r1=1022789&r2=1022790&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/util/TestHarness.java Fri Oct 15 00:42:46 2010
@@ -308,7 +308,7 @@ public class TestHarness {
   }
 
   /**
-   * Processes a "query" using a user constructed SolrQueryRequest
+   * Processes a "query" using a user constructed SolrQueryRequest, and closes the request at the end.
    *
    * @param handler the name of the request handler to process the request
    * @param req the Query to process, will be closed.
@@ -318,17 +318,22 @@ public class TestHarness {
    * @see LocalSolrQueryRequest
    */
   public String query(String handler, SolrQueryRequest req) throws IOException, Exception {
-    SolrQueryResponse rsp = queryAndResponse(handler, req);
+    try {
+      SolrQueryResponse rsp = queryAndResponse(handler, req);
 
-    StringWriter sw = new StringWriter(32000);
-    QueryResponseWriter responseWriter = core.getQueryResponseWriter(req);
-    responseWriter.write(sw,req,rsp);
+      StringWriter sw = new StringWriter(32000);
+      QueryResponseWriter responseWriter = core.getQueryResponseWriter(req);
+      responseWriter.write(sw,req,rsp);
 
-    req.close();
+      req.close();
 
-    return sw.toString();
+      return sw.toString();
+    } finally {
+      req.close();
+    }
   }
 
+  /** It is the users responsibility to close the request object when done with it */
   public SolrQueryResponse queryAndResponse(String handler, SolrQueryRequest req) throws Exception {
     SolrQueryResponse rsp = new SolrQueryResponse();
     core.execute(core.getRequestHandler(handler),req,rsp);