Skip to content

Commit 7f9e0fd

Browse files
committed
Handle missing expression file in GSEA rpt file. Fixes #309
1 parent fb11014 commit 7f9e0fd

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/resolver/GSEAResolver.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ private static Optional<Path> getRptExpressionFile(Path root, Map<String,String>
132132
return Optional.empty();
133133
}
134134

135+
if(data == null)
136+
return Optional.empty();
137+
135138
try {
136139
Path exprfile = Paths.get(data);
137140
if(Files.exists(exprfile))

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/resolver/ResolverTask.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ public void run(TaskMonitor taskMonitor) throws Exception {
3737
if(cancelled)
3838
break;
3939

40-
if(Files.isDirectory(path)) {
41-
List<DataSetParameters> dataSets = DataSetResolver.guessDataSets(path, (CancelStatus)this);
42-
results.addAll(dataSets);
40+
try {
41+
if(Files.isDirectory(path)) {
42+
List<DataSetParameters> dataSets = DataSetResolver.guessDataSets(path, (CancelStatus)this);
43+
results.addAll(dataSets);
44+
}
45+
} catch(Exception e) {
46+
throw new RuntimeException("Error while resolving path: " + path, e);
4347
}
4448
}
4549
}

0 commit comments

Comments
 (0)