svn commit: r599458 - in /lucene/solr/trunk/src: java/org/apache/solr/request/SolrQueryRequestBase.java test/org/apache/solr/handler/StandardRequestHandlerTest.java

[ryan]

Author: ryan
Date: Thu Nov 29 06:36:49 2007
New Revision: 599458

URL: http://svn.apache.org/viewvc?rev=599458&view=rev
Log:
Set the searcherHolder to null on close.  See:
http://www.nabble.com/AlreadyClosedException-in-JUnit-tests--tf4893565.html

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java
    
lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java?rev=599458&r1=599457&r2=599458&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java 
(original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java 
Thu Nov 29 06:36:49 2007
@@ -193,6 +193,7 @@
   public void close() {
     if (searcherHolder!=null) {
       searcherHolder.decref();
+      searcherHolder = null;
     }
   }
 

Modified: 
lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java?rev=599458&r1=599457&r2=599458&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
 (original)
+++ 
lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
 Thu Nov 29 06:36:49 2007
@@ -76,6 +76,9 @@
     // Make sure score parsing works
     args.put( CommonParams.SORT, "score desc" );
     assertQ("with sort param [desc]", req,"//[EMAIL PROTECTED]'3']" );
+
+    args.put( CommonParams.SORT, "score asc" );
+    assertQ("with sort param [desc]", req,"//[EMAIL PROTECTED]'3']" );
     
     // Using legacy ';' param
     args.remove( CommonParams.SORT );