fixing bug in SeekableHttpStream.read #1182
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* a bug in SeekableHttpStream could cause clients to go into an infinite loop because read would return 0 when trying to read one byte past the end of the file * fixes #1181
|
@dtitov I think this should fix the problem you reported. |
|
Thanks for the quick fix! I tested it and it works 👍 |
pshapiro4broad
approved these changes
Sep 26, 2018
| @@ -31,6 +31,7 @@ | |||
| import java.io.File; | |||
| import java.io.FileNotFoundException; | |||
| import java.io.IOException; | |||
| import java.net.MalformedURLException; | |||
There was a problem hiding this comment.
unnecessary import?
| @@ -69,6 +70,20 @@ public void testRandomRead() throws IOException { | |||
| assertEquals(buffer1, buffer2); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testReadExactlyOneByteAtEndOfFile() throws IOException { | |||
| try( SeekableStream stream = new SeekableHTTPStream(new URL(BAM_URL_STRING))){ | |||
There was a problem hiding this comment.
odd whitespace here, I would expect to see try (SeekableStream stream = new SeekableHTTPStream(new URL(BAM_URL_STRING))) {
jacarey
approved these changes
Sep 26, 2018
Codecov Report
@@ Coverage Diff @@
## master #1182 +/- ##
===============================================
+ Coverage 68.398% 68.406% +0.008%
- Complexity 8013 8014 +1
===============================================
Files 541 541
Lines 32688 32690 +2
Branches 5528 5529 +1
===============================================
+ Hits 22358 22362 +4
+ Misses 8125 8124 -1
+ Partials 2205 2204 -1
|
| @@ -69,6 +69,20 @@ public void testRandomRead() throws IOException { | |||
| assertEquals(buffer1, buffer2); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testReadExactlyOneByteAtEndOfFile() throws IOException { | |||
| try (final SeekableStream stream = new SeekableHTTPStream(new URL(BAM_URL_STRING))){ | |||
There was a problem hiding this comment.
Almost, still missing the space between the ){. If you select the line and use the IDE's Reformat Code it will fix it for you.
There was a problem hiding this comment.
whoops, didn't see your comment until after I merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SeekableHttpStreamcould cause clients to go into an infinite loop because read would return 0 when trying to read one byte past the end of the file