svn commit: r1596986 - in /manifoldcf/branches/release-1.6-branch: ./ CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

[kwright]

Author: kwright
Date: Thu May 22 23:31:16 2014
New Revision: 1596986

URL: http://svn.apache.org/r1596986
Log:
Pull up fix for CONNECTORS-941 from trunk.

Modified:
    manifoldcf/branches/release-1.6-branch/   (props changed)
    manifoldcf/branches/release-1.6-branch/CHANGES.txt
    
manifoldcf/branches/release-1.6-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

Propchange: manifoldcf/branches/release-1.6-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1596908

Modified: manifoldcf/branches/release-1.6-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/CHANGES.txt?rev=1596986&r1=1596985&r2=1596986&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.6-branch/CHANGES.txt Thu May 22 23:31:16 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 1.6.1 =====================
 
+CONNECTORS-941: Solr connector not working properly with basic auth.
+(Erlend Garåsen, Karl Wright)
+
 CONNECTORS-938: Allow JSPs to all work properly with Java 8.
 (Arcadius Ahouansou, Ahmet Arslan)
 

Modified: 
manifoldcf/branches/release-1.6-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java?rev=1596986&r1=1596985&r2=1596986&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.6-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
 (original)
+++ 
manifoldcf/branches/release-1.6-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
 Thu May 22 23:31:16 2014
@@ -280,8 +280,8 @@ public class ModifiedHttpSolrServer exte
     }
     
     // XXX client already has this set, is this needed?
-    method.getParams().setParameter(ClientPNames.HANDLE_REDIRECTS,
-        followRedirects);
+    //method.getParams().setParameter(ClientPNames.HANDLE_REDIRECTS,
+    //    followRedirects);
     method.addHeader("User-Agent", AGENT);
     
     InputStream respBody = null;