Skip to content

Commit d5a13ca

Browse files
committed
Another fix for jobs with archived readsets
1 parent a3ad981 commit d5a13ca

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceReadsetHandlerJob.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected SequenceReadsetHandlerJob()
3434
{
3535
}
3636

37-
public SequenceReadsetHandlerJob(Container c, User user, @Nullable String jobName, PipeRoot pipeRoot, SequenceOutputHandler handler, List<SequenceReadsetImpl> readsets, JSONObject jsonParams) throws IOException
37+
public SequenceReadsetHandlerJob(Container c, User user, @Nullable String jobName, PipeRoot pipeRoot, SequenceOutputHandler<?> handler, List<SequenceReadsetImpl> readsets, JSONObject jsonParams) throws IOException
3838
{
3939
super(SequenceReadsetHandlerPipelineProvider.NAME, c, user, jobName, pipeRoot, jsonParams, null, SequenceOutputHandlerJob.FOLDER_NAME);
4040

@@ -50,7 +50,7 @@ public SequenceReadsetHandlerJob(Container c, User user, @Nullable String jobNam
5050
}
5151

5252
@Override
53-
public TaskPipeline getTaskPipeline()
53+
public TaskPipeline<?> getTaskPipeline()
5454
{
5555
return PipelineJobService.get().getTaskPipeline(new TaskId(SequenceReadsetHandlerJob.class));
5656
}
@@ -81,7 +81,11 @@ public List<File> getInputFiles()
8181
{
8282
for (ReadData d : rs.getReadData())
8383
{
84-
ret.add(d.getFile1());
84+
if (d.getFile1() != null)
85+
{
86+
ret.add(d.getFile1());
87+
}
88+
8589
if (d.getFile2() != null)
8690
{
8791
ret.add(d.getFile2());

0 commit comments

Comments
 (0)