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/10/15 20:51:30 UTC

svn commit: r1632165 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/solrj/ solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java

Author: shalin
Date: Wed Oct 15 18:51:29 2014
New Revision: 1632165

URL: http://svn.apache.org/r1632165
Log:
SOLR-4715: Fixing precommit and removing incorrect javadocs

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
    lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1632165&r1=1632164&r2=1632165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java Wed Oct 15 18:51:29 2014
@@ -208,7 +208,7 @@ public class CloudSolrServer extends Sol
    *          <p/>
    *          "zoo1.example.com:2181,zoo2.example.com:2181,zoo3.example.com:2181"
    * @param httpClient
-   *          the {@see HttpClient} instance to be used for all requests. The
+   *          the {@link HttpClient} instance to be used for all requests. The
    *          provided httpClient should use a multi-threaded connection manager.
    */
   public CloudSolrServer(String zkHost, HttpClient httpClient)  {
@@ -260,7 +260,7 @@ public class CloudSolrServer extends Sol
    *          A chroot value for zookeeper, starting with a forward slash. If no
    *          chroot is required, use null.
    * @param httpClient
-   *          the {@see HttpClient} instance to be used for all requests. The provided httpClient should use a
+   *          the {@link HttpClient} instance to be used for all requests. The provided httpClient should use a
    *          multi-threaded connection manager.
    * @throws IllegalArgumentException
    *           if the chroot value does not start with a forward slash.
@@ -316,7 +316,7 @@ public class CloudSolrServer extends Sol
    * @param updatesToLeaders
    *          If true, sends updates only to shard leaders.
    * @param httpClient
-   *          the {@see HttpClient} instance to be used for all requests. The provided httpClient should use a
+   *          the {@link HttpClient} instance to be used for all requests. The provided httpClient should use a
    *          multi-threaded connection manager.
    * @see #CloudSolrServer(String) for full description and details on zkHost
    */

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1632165&r1=1632164&r2=1632165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java Wed Oct 15 18:51:29 2014
@@ -645,9 +645,7 @@ public class LBHttpSolrServer extends So
 
   /**
    * Changes the {@link ResponseParser} that will be used for the internal
-   * SolrServer objects. Throws an exception if used after internal server
-   * objects have been added, so if you want to use this method, you must
-   * not put any URLs in your constructor.
+   * SolrServer objects.
    *
    * @param parser Default Response Parser chosen to parse the response if the parser
    *               were not specified as part of the request.
@@ -659,9 +657,7 @@ public class LBHttpSolrServer extends So
 
   /**
    * Changes the {@link RequestWriter} that will be used for the internal
-   * SolrServer objects. Throws an exception if used after internal server
-   * objects have been added, so if you want to use this method, you must
-   * not put any URLs in your constructor.
+   * SolrServer objects.
    *
    * @param requestWriter Default RequestWriter, used to encode requests sent to the server.
    */