You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/04/21 01:44:30 UTC
svn commit: r1328539 -
/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
Author: ryan
Date: Fri Apr 20 23:44:30 2012
New Revision: 1328539
URL: http://svn.apache.org/viewvc?rev=1328539&view=rev
Log:
SOLR-2020: don't send a null mime-type
Modified:
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java?rev=1328539&r1=1328538&r2=1328539&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java Fri Apr 20 23:44:30 2012
@@ -290,10 +290,14 @@ public class HttpSolrServer extends Solr
if (isMultipart) {
for (ContentStream content : streams) {
- parts.add(new FormBodyPart(content.getName(),
+ String contentType = content.getContentType();
+ if(contentType==null) {
+ contentType = "application/octet-stream"; // default
+ }
+ parts.add(new FormBodyPart(content.getName(),
new InputStreamBody(
content.getStream(),
- content.getContentType(),
+ contentType,
content.getName())));
}
}