Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rework getShiroIni in zeppelinConfiguration, if shiro.ini file is not found, then return empty instead of shiro.ini.template path

Browse source
This commit is contained in:
Anthony Corbacho 2016-11-04 14:22:57 +09:00
parent b6cd479960
commit 09387cea8a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
View file

@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.notebook.repo.VFSNotebookRepo;
import org.apache.zeppelin.util.Util;
import org.slf4j.Logger;
@ -402,9 +403,8 @@ public class ZeppelinConfiguration extends XMLConfiguration {
}
public String getShiroPath() {
String shiroPath = getRelativeDir(String.format("%s/shiro.ini", getConfDir()));
return new File(shiroPath).exists() ? shiroPath
: getRelativeDir(String.format("%s/shiro.ini.template", getConfDir()));
String shiroPath = getRelativeDir(String.format("%s/shiro.ini", getConfDir()));
return new File(shiroPath).exists() ? shiroPath : StringUtils.EMPTY;
}
public String getInterpreterRemoteRunnerPath() {