Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-597: SolrServlet no longer "caches" SolrCore. This was causing problems in Resin, and could potentially cause problems for customized usages of SolrServlet. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@667190 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2008-06-12 18:27:50 +00:00
parent 7f0cc46ad7
commit f690d9facf
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -426,6 +426,10 @@ Bug Fixes
34. SOLR-590: Limitation in pgrep on Linux platform breaks script-utils fixUser. (Hannes Schmidt via billa) 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 Other Changes
1. SOLR-135: Moved common classes to org.apache.solr.common and altered the 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 build scripts to make two jars: apache-solr-1.3.jar and

5
src/webapp/src/org/apache/solr/servlet/SolrServlet.java
View File

@ -39,11 +39,11 @@ import org.apache.solr.request.SolrRequestHandler;
public class SolrServlet extends HttpServlet { public class SolrServlet extends HttpServlet {
final Logger log = Logger.getLogger(SolrServlet.class.getName()); final Logger log = Logger.getLogger(SolrServlet.class.getName());
SolrCore core;
public void init() throws ServletException { public void init() throws ServletException {
log.info("SolrServlet.init()"); 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"); log.info("SolrServlet.init() done");
} }
@ -52,6 +52,7 @@ public class SolrServlet extends HttpServlet {
} }
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
final SolrCore core = SolrCore.getSolrCore();
SolrServletRequest solrReq = new SolrServletRequest(core, request);; SolrServletRequest solrReq = new SolrServletRequest(core, request);;
SolrQueryResponse solrRsp = new SolrQueryResponse(); SolrQueryResponse solrRsp = new SolrQueryResponse();
try { try {