Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrading to htsjdk 2.16.1 #5168

Merged
merged 1 commit into from
Sep 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ repositories {
}

final requiredJavaVersion = "8"
final htsjdkVersion = System.getProperty('htsjdk.version','2.16.0')
final htsjdkVersion = System.getProperty('htsjdk.version','2.16.1')
final picardVersion = System.getProperty('picard.version','2.18.7')
final barclayVersion = System.getProperty('barclay.version','2.1.0')
final sparkVersion = System.getProperty('spark.version', '2.2.0')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ private static void gatherWithBlockCopying(final List<Path> vcfs, final File out
// If we found the end of the header then write the remainder of this block out as a
// new gzip block and then break out of the while loop
if (firstNonHeaderByteIndex >= 0) {
final BlockCompressedOutputStream blockOut = new BlockCompressedOutputStream(out, null);
final BlockCompressedOutputStream blockOut = new BlockCompressedOutputStream(out, (Path)null);
blockOut.write(blockContents, firstNonHeaderByteIndex, blockContents.length - firstNonHeaderByteIndex);
blockOut.flush();
// Don't close blockOut because closing underlying stream would break everything
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ public static GenotypeCounts computeDiploidGenotypeCounts(final VariantContext v
final Allele a1 = g.getAllele(0);
final Allele a2 = g.getAllele(1);
if (a2.isNonReference()) {
final int[] idxVector = vc.getGLIndecesOfAlternateAllele(a2);
final int[] idxVector = vc.getGLIndicesOfAlternateAllele(a2);
idxAA = idxVector[0];
idxAB = idxVector[1];
idxBB = idxVector[2];
}
//I expect hets to be reference first, but there are no guarantees (e.g. phasing)
else if (a1.isNonReference()) {
final int[] idxVector = vc.getGLIndecesOfAlternateAllele(a1);
final int[] idxVector = vc.getGLIndicesOfAlternateAllele(a1);
idxAA = idxVector[0];
idxAB = idxVector[1];
idxBB = idxVector[2];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static void convertHeaderlessHadoopBamShardToBam( final File bamShard, fi
* @param outputStream stream to write the SAM header to
*/
private static void writeBAMHeaderToStream( final SAMFileHeader samFileHeader, final OutputStream outputStream ) {
final BlockCompressedOutputStream blockCompressedOutputStream = new BlockCompressedOutputStream(outputStream, null);
final BlockCompressedOutputStream blockCompressedOutputStream = new BlockCompressedOutputStream(outputStream, (File)null);
final BinaryCodec outputBinaryCodec = new BinaryCodec(new DataOutputStream(blockCompressedOutputStream));

final String headerString;
Expand Down