svn commit: r573893 [3/3] - in /lucene/solr/trunk: ./ client/java/solrj/src/org/apache/solr/client/solrj/embedded/ client/java/solrj/test/org/apache/solr/client/solrj/embedded/ src/java/org/apache/solr/analysis/ src/java/org/apache/solr/core/ src/java/...

[ry...@apache.org]

Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java?rev=573893&r1=573892&r2=573893&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java Sat Sep  8 12:03:54 2007
@@ -65,15 +65,16 @@
   private boolean enableRemoteStreams = false;
   private StandardRequestParser standard;
   
-  public SolrRequestParsers( SolrCore core, Config config )
+  public SolrRequestParsers( SolrCore core )
   {
     this.core = core;
+    Config config = core.getSolrConfig();
     
     // Read the configuration
-    long uploadLimitKB = SolrConfig.config.getInt( 
+    long uploadLimitKB = config.getInt( 
         "requestDispatcher/requestParsers/@multipartUploadLimitInKB", 2000 ); // 2MB default
     
-    this.enableRemoteStreams = SolrConfig.config.getBool( 
+    this.enableRemoteStreams = config.getBool( 
         "requestDispatcher/requestParsers/@enableRemoteStreaming", false ); 
         
     MultipartRequestParser multi = new MultipartRequestParser( uploadLimitKB );

Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java?rev=573893&r1=573892&r2=573893&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java Sat Sep  8 12:03:54 2007
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.solr.core.SolrCore;
 import org.apache.solr.handler.XmlUpdateRequestHandler;
 import org.apache.solr.request.QueryResponseWriter;
 import org.apache.solr.request.XMLResponseWriter;
@@ -51,7 +52,8 @@
     BufferedReader requestReader = request.getReader();
     response.setContentType(QueryResponseWriter.CONTENT_TYPE_XML_UTF8);
 
+    SolrCore core = SolrCore.getSolrCore();
     PrintWriter writer = response.getWriter();
-    legacyUpdateHandler.doLegacyUpdate(requestReader, writer);
+    legacyUpdateHandler.doLegacyUpdate(core,requestReader, writer);
   }
 }