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

SOLR-6533: formatting fixed 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1658917 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2015-02-11 10:41:13 +00:00
parent 648eebbe92
commit 2eb8ae20a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solr/core/src/java/org/apache/solr/core/SolrCore.java
View File

@ -2647,9 +2647,9 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
* to 'touch' the /conf directory by setting some data so that events are triggered. * to 'touch' the /conf directory by setting some data so that events are triggered.
*/ */
private void registerConfListener() { private void registerConfListener() {
if( ! (resourceLoader instanceof ZkSolrResourceLoader)) return; if (!(resourceLoader instanceof ZkSolrResourceLoader)) return;
final ZkSolrResourceLoader zkSolrResourceLoader = (ZkSolrResourceLoader) resourceLoader; final ZkSolrResourceLoader zkSolrResourceLoader = (ZkSolrResourceLoader) resourceLoader;
if(zkSolrResourceLoader != null) if (zkSolrResourceLoader != null)
zkSolrResourceLoader.getZkController().registerConfListenerForCore( zkSolrResourceLoader.getZkController().registerConfListenerForCore(
zkSolrResourceLoader.getConfigSetZkPath(), zkSolrResourceLoader.getConfigSetZkPath(),
this, this,
@ -2687,7 +2687,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
} }
if (cfg != null) { if (cfg != null) {
cfg.refreshRequestParams() ; cfg.refreshRequestParams();
} }
if (checkStale(zkClient, overlayPath, solrConfigversion) || if (checkStale(zkClient, overlayPath, solrConfigversion) ||
checkStale(zkClient, solrConfigPath, overlayVersion) || checkStale(zkClient, solrConfigPath, overlayVersion) ||