You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/03 05:36:48 UTC
svn commit: r1573443 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/solrj/
solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
Author: markrmiller
Date: Mon Mar 3 04:36:48 2014
New Revision: 1573443
URL: http://svn.apache.org/r1573443
Log:
SOLR-5761: HttpSolrServer has a few fields that can be set via setters but are not volatile.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1573443&r1=1573442&r2=1573443&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Mar 3 04:36:48 2014
@@ -64,6 +64,9 @@ Bug Fixes
streamDeletes is true that should be tucked into the if statement below it.
(Mark Miller, Gregory Chanan)
+* SOLR-5761: HttpSolrServer has a few fields that can be set via setters but
+ are not volatile. (Mark Miller, Gregory Chanan)
+
Optimizations
----------------------
* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java?rev=1573443&r1=1573442&r2=1573443&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java Mon Mar 3 04:36:48 2014
@@ -86,7 +86,7 @@ public class HttpSolrServer extends Solr
/**
* The URL of the Solr server.
*/
- protected String baseUrl;
+ protected volatile String baseUrl;
/**
* Default value: null / empty.
@@ -115,14 +115,14 @@ public class HttpSolrServer extends Solr
private final HttpClient httpClient;
- private boolean followRedirects = false;
+ private volatile boolean followRedirects = false;
- private int maxRetries = 0;
+ private volatile int maxRetries = 0;
- private boolean useMultiPartPost;
+ private volatile boolean useMultiPartPost;
private final boolean internalClient;
- private Set<String> queryParams = Collections.emptySet();
+ private volatile Set<String> queryParams = Collections.emptySet();
/**
* @param baseURL