You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2014/12/30 01:20:26 UTC

svn commit: r1648452 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/solrj/ solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java

Author: anshum
Date: Tue Dec 30 00:20:25 2014
New Revision: 1648452

URL: http://svn.apache.org/r1648452
Log:
SOLR-6899: Make CollectionAdminRequest.action setter protected instead of public (merge from trunk)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, 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/request/CollectionAdminRequest.java

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1648452&r1=1648451&r2=1648452&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Dec 30 00:20:25 2014
@@ -326,6 +326,9 @@ Bug Fixes
 * SOLR-6397: zkcli script put/putfile should allow overwriting an existing znode's data
   (Timothy Potter)
 
+* SOLR-6899: Change public setter for CollectionAdminRequest.action to protected.
+  (Anshum Gupta)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java?rev=1648452&r1=1648451&r2=1648452&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java Tue Dec 30 00:20:25 2014
@@ -48,8 +48,7 @@ public class CollectionAdminRequest exte
 
   private static String PROPERTY_PREFIX = "property.";
 
-  public void setAction( CollectionAction action )
-  {
+  protected void setAction( CollectionAction action ) {
     this.action = action;
   }