Author: hossman
Date: Thu Jun 12 11:27:50 2008
New Revision: 667190
URL: http://svn.apache.org/viewvc?rev=667190&view=rev
Log:
SOLR-597: SolrServlet no longer "caches" SolrCore. This was causing problems
in Resin, and could potentially cause problems for customized usages of
SolrServlet.
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
Modified: lucene/solr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=667190&r1=667189&r2=667190&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Thu Jun 12 11:27:50 2008
@@ -426,6 +426,10 @@
34. SOLR-590: Limitation in pgrep on Linux platform breaks script-utils
fixUser. (Hannes Schmidt via billa)
+35. SOLR-597: SolrServlet no longer "caches" SolrCore. This was causing
+ problems in Resin, and could potentially cause problems for customized
+ usages of SolrServlet.
+
Other Changes
1. SOLR-135: Moved common classes to org.apache.solr.common and altered the
build scripts to make two jars: apache-solr-1.3.jar and
Modified:
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java?rev=667190&r1=667189&r2=667190&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
(original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
Thu Jun 12 11:27:50 2008
@@ -39,11 +39,11 @@
public class SolrServlet extends HttpServlet {
final Logger log = Logger.getLogger(SolrServlet.class.getName());
- SolrCore core;
public void init() throws ServletException {
log.info("SolrServlet.init()");
- core = SolrCore.getSolrCore();
+ // we deliberately do not initialize a SolrCore because of SOLR-597
+ // https://issues.apache.org/jira/browse/SOLR-597
log.info("SolrServlet.init() done");
}
@@ -52,6 +52,7 @@
}
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
+ final SolrCore core = SolrCore.getSolrCore();
SolrServletRequest solrReq = new SolrServletRequest(core, request);;
SolrQueryResponse solrRsp = new SolrQueryResponse();
try {
