You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/01/30 18:16:01 UTC
svn commit: r1562898 - in /lucene/dev/trunk/solr: CHANGES.txt
solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java
Author: shalin
Date: Thu Jan 30 17:16:00 2014
New Revision: 1562898
URL: http://svn.apache.org/r1562898
Log:
SOLR-5673: HttpSolrServer doesn't set own property correctly in setFollowRedirects
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1562898&r1=1562897&r2=1562898&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Jan 30 17:16:00 2014
@@ -241,6 +241,9 @@ Bug Fixes
* SOLR-5679: Shard splitting fails with ClassCastException on collections
upgraded from 4.5 and earlier versions. (Brett Hoerner, shalin)
+* SOLR-5673: HTTPSolrServer doesn't set own property correctly in
+ setFollowRedirects. (Frank Wesemann via shalin)
+
Optimizations
----------------------
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=1562898&r1=1562897&r2=1562898&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 Thu Jan 30 17:16:00 2014
@@ -595,7 +595,7 @@ public class HttpSolrServer extends Solr
* </p>
*/
public void setFollowRedirects(boolean followRedirects) {
- this.followRedirects = true;
+ this.followRedirects = followRedirects;
HttpClientUtil.setFollowRedirects(httpClient, followRedirects);
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java?rev=1562898&r1=1562897&r2=1562898&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java Thu Jan 30 17:16:00 2014
@@ -412,6 +412,14 @@ public class BasicHttpSolrServerTest ext
} catch (Throwable t) {
fail("Exception was thrown:" + t);
}
+ //And back again:
+ server.setFollowRedirects(false);
+ try {
+ QueryResponse response = server.query(q);
+ fail("Should have thrown an exception.");
+ } catch (SolrServerException e) {
+ assertTrue(e.getMessage().contains("redirect"));
+ }
server.shutdown();
}