zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged bug fix from Stable into Unstable

This commit is contained in:
Matt Hanna 2011-10-27 11:31:17 -04:00
parent 9ca2828547 41ddc7bce7
commit f7df8bdecc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java
View File

@ -1,6 +1,7 @@
package org.broadinstitute.sting.gatk.executive; package org.broadinstitute.sting.gatk.executive;
import net.sf.picard.reference.IndexedFastaSequenceFile; import net.sf.picard.reference.IndexedFastaSequenceFile;
import org.broad.tribble.TribbleException;
import org.broadinstitute.sting.gatk.GenomeAnalysisEngine; import org.broadinstitute.sting.gatk.GenomeAnalysisEngine;
import org.broadinstitute.sting.gatk.datasources.reads.SAMDataSource; import org.broadinstitute.sting.gatk.datasources.reads.SAMDataSource;
import org.broadinstitute.sting.gatk.datasources.reads.Shard; import org.broadinstitute.sting.gatk.datasources.reads.Shard;
@ -258,9 +259,18 @@ public class HierarchicalMicroScheduler extends MicroScheduler implements Hierar
traverser.waitForComplete(); traverser.waitForComplete();
OutputMergeTask mergeTask = traverser.getOutputMergeTask(); OutputMergeTask mergeTask = traverser.getOutputMergeTask();
if( mergeTask != null ) if( mergeTask != null ) {
try {
mergeTask.merge(); mergeTask.merge();
} }
catch(TribbleException ex) {
// Specifically catch Tribble I/O exceptions and rethrow them as Reviewed. We don't expect
// any issues here because we created the Tribble output file mere moments ago and expect it to
// be completely valid.
throw new ReviewedStingException("Unable to merge temporary Tribble output file.",ex);
}
}
}
long endTime = System.currentTimeMillis(); long endTime = System.currentTimeMillis();