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

[ZEPPELIN-2699] Bug-fix on gathering package info

Browse source
This commit is contained in:
Nelson Costa 2017-07-06 11:18:02 +01:00
parent 2b1ff8ae82
commit c823021868
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java
View file

@ -16,11 +16,8 @@
*/
package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.resource.DistributedResourcePool;
@ -49,7 +46,7 @@ public class Helium {
private final HeliumBundleFactory bundleFactory;
private final HeliumApplicationFactory applicationFactory;
private Map<String, List<HeliumPackageSearchResult>> allPackages;
private Map<String, List<HeliumPackageSearchResult>> allPackages = new HashMap<>();
public Helium(
String heliumConfPath,
@ -178,8 +175,7 @@ public class Helium {
Map<String, String> enabledPackageInfo = heliumConf.getEnabledPackages();
synchronized (registry) {
if (refresh || allPackages == null) {
allPackages = new HashMap<>();
if (refresh || !allPackages.containsKey(packageName)) {
for (HeliumRegistry r : registry) {
try {
for (HeliumPackage pkg : r.getAll()) {
@ -189,11 +185,12 @@ public class Helium {
!name.equals(packageName)) {
continue;
}
boolean enabled = enabledPackageInfo.containsKey(pkg.getName());
if (!allPackages.containsKey(name)) {
allPackages.put(name, new LinkedList<HeliumPackageSearchResult>());
if (allPackages.containsKey(name)) {
allPackages.remove(name);
}
allPackages.put(name, new LinkedList<HeliumPackageSearchResult>());
boolean enabled = enabledPackageInfo.containsKey(pkg.getName());
allPackages.get(name).add(new HeliumPackageSearchResult(r.name(), pkg, enabled));
}
} catch (IOException e) {