svn commit: r787143 - /lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java

[no...@apache.org]

Author: noble
Date: Mon Jun 22 05:34:28 2009
New Revision: 787143

URL: http://svn.apache.org/viewvc?rev=787143&view=rev
Log:
lazily get searcher and schema. for coreadmin requests it does not need these

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java?rev=787143&r1=787142&r2=787143&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java Mon Jun 22 05:34:28 2009
@@ -61,8 +61,9 @@
   }
 
   private static class Resolver implements JavaBinCodec.ObjectResolver {
-    private final IndexSchema schema;
-    private final SolrIndexSearcher searcher;
+    private final SolrQueryRequest solrQueryRequest;
+    private IndexSchema schema;
+    private SolrIndexSearcher searcher;
     private final Set<String> returnFields;
     private final boolean includeScore;
 
@@ -71,8 +72,7 @@
     boolean useFieldObjects = true;
 
     public Resolver(SolrQueryRequest req, Set<String> returnFields) {
-      this.schema = req.getSchema();
-      this.searcher = req.getSearcher();
+      solrQueryRequest = req;
       this.includeScore = returnFields != null && returnFields.contains("score");
 
       if (returnFields != null) {
@@ -114,7 +114,8 @@
 
       int sz = ids.size();
       codec.writeTag(JavaBinCodec.ARR, sz);
-
+      if(searcher == null) searcher = solrQueryRequest.getSearcher();
+      if(schema == null) schema = solrQueryRequest.getSchema(); 
       DocIterator iterator = ids.iterator();
       for (int i = 0; i < sz; i++) {
         int id = iterator.nextDoc();