Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7552: Support using ZkCredentialsProvider/ZkACLProvider in custom filter 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1680120 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gregory Chanan 2015-05-18 23:11:39 +00:00
parent a49a6b5dc4
commit 88941936ca
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
View File

@ -128,7 +128,12 @@ public class SolrDispatchFilter extends BaseSolrFilter {
return cores;
}
private NodeConfig loadNodeConfig(String solrHome, Properties nodeProperties) {
/**
* Get the NodeConfig whether stored on disk, in ZooKeeper, etc.
* This may also be used by custom filters to load relevant configuration.
* @return the NodeConfig
*/
public static NodeConfig loadNodeConfig(String solrHome, Properties nodeProperties) {
SolrResourceLoader loader = new SolrResourceLoader(solrHome, null, nodeProperties);

4
solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java
View File

@ -31,11 +31,11 @@ public interface ZkCredentialsProvider {
this.auth = auth;
}
String getScheme() {
public String getScheme() {
return scheme;
}
byte[] getAuth() {
public byte[] getAuth() {
return auth;
}
}