svn commit: r1447262 - /manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

[kwright]

Author: kwright
Date: Mon Feb 18 13:58:05 2013
New Revision: 1447262

URL: http://svn.apache.org/r1447262
Log:
Ok, REALLY enable multipart forms. Part of CONNECTORS-632.

Modified:
    
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

Modified: 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java?rev=1447262&r1=1447261&r2=1447262&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
 (original)
+++ 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
 Mon Feb 18 13:58:05 2013
@@ -140,7 +140,7 @@ public class ModifiedHttpSolrServer exte
           else if( SolrRequest.METHOD.POST == request.getMethod() ) {
 
             String url = baseUrl + path;
-            boolean isMultipart = ( streams != null && streams.size() > 1 );
+            boolean isMultipart = this.useMultiPartPost || ( streams != null 
&& streams.size() > 1 );
 
             LinkedList<NameValuePair> postParams = new 
LinkedList<NameValuePair>();
             if (streams == null || isMultipart) {
@@ -158,7 +158,7 @@ public class ModifiedHttpSolrServer exte
                 String[] vals = params.getParams(p);
                 if (vals != null) {
                   for (String v : vals) {
-                    if (this.useMultiPartPost || isMultipart) {
+                    if (isMultipart) {
                       parts.add(new FormBodyPart(p, new StringBody(v, 
Charset.forName("UTF-8"))));
                     } else {
                       postParams.add(new BasicNameValuePair(p, v));