You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/01/28 02:12:39 UTC
svn commit: r1064402 - in /lucene/dev/branches/branch_3x/solr: ./
CHANGES.txt src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
src/webapp/web/admin/index.jsp
Author: hossman
Date: Fri Jan 28 01:12:39 2011
New Revision: 1064402
URL: http://svn.apache.org/viewvc?rev=1064402&view=rev
Log:
SOLR-1940: merge 1064395 from trunk
Modified:
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1064402&r1=1064401&r2=1064402&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Jan 28 01:12:39 2011
@@ -493,6 +493,9 @@ Bug Fixes
* SOLR-2085: Improve SolrJ behavior when FacetComponent comes before
QueryComponent (Tomas Salfischberger via hossman)
+* SOLR-1940: Fix SolrDispatchFilter behavior when Content-Type is
+ unknown (Lance Norskog and hossman)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1064402&r1=1064401&r2=1064402&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java Fri Jan 28 01:12:39 2011
@@ -318,7 +318,9 @@ public class SolrDispatchFilter implemen
sendError((HttpServletResponse) response, solrRsp.getException());
} else {
// Now write it out
- response.setContentType(responseWriter.getContentType(solrReq, solrRsp));
+ final String ct = responseWriter.getContentType(solrReq, solrRsp);
+ // don't call setContentType on null
+ if (null != ct) response.setContentType(ct);
if (Method.HEAD != reqMethod) {
if (responseWriter instanceof BinaryQueryResponseWriter) {
BinaryQueryResponseWriter binWriter = (BinaryQueryResponseWriter) responseWriter;
Modified: lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp?rev=1064402&r1=1064401&r2=1064402&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp Fri Jan 28 01:12:39 2011
@@ -39,10 +39,10 @@
</td>
<td>
<% if (null != core.getSchemaResource()) { %>
- [<a href="file/?file=<%=core.getSchemaResource()%>">Schema</a>]
+ [<a href="file/?contentType=text/xml;charset=utf-8&file=<%=core.getSchemaResource()%>">Schema</a>]
<% }
if (null != core.getConfigResource()) { %>
- [<a href="file/?file=<%=core.getConfigResource()%>">Config</a>]
+ [<a href="file/?contentType=text/xml;charset=utf-8&file=<%=core.getConfigResource()%>">Config</a>]
<% } %>
[<a href="analysis.jsp?highlight=on">Analysis</a>]
[<a href="schema.jsp">Schema Browser</a>] <%if(replicationhandler){%>[<a href="replication/index.jsp">Replication</a>]<%}%>