diff --git a/java/src/org/broadinstitute/sting/gatk/dataSources/simpleDataSources/SAMBAMDataSource.java b/java/src/org/broadinstitute/sting/gatk/dataSources/simpleDataSources/SAMBAMDataSource.java index 795cab75f..863edf7be 100644 --- a/java/src/org/broadinstitute/sting/gatk/dataSources/simpleDataSources/SAMBAMDataSource.java +++ b/java/src/org/broadinstitute/sting/gatk/dataSources/simpleDataSources/SAMBAMDataSource.java @@ -103,7 +103,7 @@ public class SAMBAMDataSource implements SimpleDataSource { * @return an iterator for that region */ public MergingSamRecordIterator2 seek(GenomeLoc location) { - MergingSamRecordIterator2 iter = new MergingSamRecordIterator2(this.mergeIterator); + MergingSamRecordIterator2 iter = null; // new MergingSamRecordIterator2(this.mergeIterator.getMergedHeader().); if (locusMode) { iter.query(location.getContig(), (int) location.getStart(), (int) location.getStop(), true); } else { diff --git a/java/src/org/broadinstitute/sting/gatk/iterators/BoundedReferenceIterator.java b/java/src/org/broadinstitute/sting/gatk/iterators/BoundedReferenceIterator.java index 2adb430ff..9083f14c3 100644 --- a/java/src/org/broadinstitute/sting/gatk/iterators/BoundedReferenceIterator.java +++ b/java/src/org/broadinstitute/sting/gatk/iterators/BoundedReferenceIterator.java @@ -1,6 +1,7 @@ package org.broadinstitute.sting.gatk.iterators; import org.broadinstitute.sting.utils.GenomeLoc; +import org.broadinstitute.sting.utils.FastaSequenceFile2; import java.util.Iterator; @@ -30,7 +31,7 @@ import java.util.Iterator; *
* This class is a decorator class from Reference Iterator (though it is constrained * by the fact that referenceIterator.seekForwardOffset explicitly returns a referenceIterator - * for now + * for now). * * TODO: Fix the underlying iterator and this class to model a real decorator pattern */ @@ -51,6 +52,16 @@ public class BoundedReferenceIterator implements Iterator