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

use "getProperty(String key, String defaultValue)" instead of "getProperty(String key)"

Browse source
This commit is contained in:
Prabhjyot Singh 2017-10-23 13:01:19 +05:30
parent e2a62f63d2
commit 4406157d22
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
View file

@ -49,7 +49,7 @@ public class ShellInterpreter extends KerberosInterpreter {
private static final Logger LOGGER = LoggerFactory.getLogger(ShellInterpreter.class);
private static final String TIMEOUT_PROPERTY = "shell.command.timeout.millisecs";
private Long DEFAULT_TIMEOUT_PROPERTY = 60000l;
private String DEFAULT_TIMEOUT_PROPERTY = "60000";
private static final String DIRECTORY_USER_HOME = "shell.working.directory.user.home";
private final boolean isWindows = System.getProperty("os.name").startsWith("Windows");
@ -102,14 +102,8 @@ public class ShellInterpreter extends KerberosInterpreter {
executor.setStreamHandler(new PumpStreamHandler(
contextInterpreter.out, contextInterpreter.out));
Long timeOutProperty;
try {
timeOutProperty = Long.valueOf(getProperty(TIMEOUT_PROPERTY));
} catch (Exception e) {
timeOutProperty = DEFAULT_TIMEOUT_PROPERTY;
LOGGER.error("Cannot convert TIMEOUT_PROPERTY to Long value, switching to default value", e);
}
executor.setWatchdog(new ExecuteWatchdog(timeOutProperty));
executor.setWatchdog(new ExecuteWatchdog(
Long.valueOf(getProperty(TIMEOUT_PROPERTY, DEFAULT_TIMEOUT_PROPERTY))));
executors.put(contextInterpreter.getParagraphId(), executor);
if (Boolean.valueOf(getProperty(DIRECTORY_USER_HOME))) {
executor.setWorkingDirectory(new File(System.getProperty("user.home")));