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

fix: mutable object problems in InterpreterSetting

Browse source 
By filling InterpreterSetting object by newly created objects
This commit is contained in:
1ambda 2016-11-15 21:59:56 +09:00
parent 5460241a38
commit 7825108e77
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
View file

@ -106,7 +106,8 @@ public class InterpreterOption {
option.perUser = other.perUser;
option.isExistingProcess = other.isExistingProcess;
option.setPermission = other.setPermission;
option.users = new ArrayList<>(other.users);
option.users = (null == other.users) ?
new ArrayList<String>() : new ArrayList<>(other.users);
return option;
}

10
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
View file

@ -285,14 +285,16 @@ public class InterpreterFactory implements InterpreterGroupFactory {
}
private InterpreterSetting createFromInterpreterSettingRef(InterpreterSetting o) {
// return immutable objects
List<InterpreterInfo> infos = new ArrayList<>(o.getInterpreterInfos());
List<Dependency> deps = new ArrayList<>(o.getDependencies());
// should return immutable objects
List<InterpreterInfo> infos = (null == o.getInterpreterInfos()) ?
new ArrayList<InterpreterInfo>() : new ArrayList<>(o.getInterpreterInfos());
List<Dependency> deps = (null == o.getDependencies()) ?
new ArrayList<Dependency>() : new ArrayList<>(o.getDependencies());
Properties props = convertInterpreterProperties((Map<String, InterpreterProperty>) o.getProperties());
InterpreterOption option = InterpreterOption.fromInterpreterOption(o.getOption());
InterpreterSetting setting = new InterpreterSetting(o.getName(), o.getName(),
o.getInterpreterInfos(), props, deps, o.getOption(), o.getPath());
infos, props, deps, option, o.getPath());
setting.setInterpreterGroupFactory(this);
return setting;
}