Improve AutoContinuingInputStream failure case #429
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
…plicate the fatal exception
…but don't be stupid about adding an exception to itself
dekobon
approved these changes
Aug 3, 2018
| bytesRead, | ||
| ex); | ||
| ex.getMessage()); |
There was a problem hiding this comment.
Is there any possibility of ex being null?
| } catch (final IOException ce) { | ||
| originalIOException.addSuppressed(ce); | ||
| super.continueWith(this.continuator.buildContinuation(originalIOException, this.getBytesRead())); | ||
| } catch (final IOException ioe) { |
There was a problem hiding this comment.
This might be paranoid, but you may want to catch UncheckedIOException as well.
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.
Currently if an unrecoverable exception happens while using try-with-resources in combination with auto-resume the following will occur:
AutoContinuingInputStreamwill catch it and invokeattemptRecoveryto ask its continuator for a continuationContinuingInputStreamwill callthis.discardWrapped()which closes the wrapped stream and setsthis.wrappedtonullattemptRecoverywill attempt to add the newly caught exception as a suppressed exception of the original (thinking it was related to recovery)AutoContinuingInputStreamcallsthis.getWrapped().close()(because the superclass already discarded the wrapped stream so there is nothing to close) so that NPE is attached to the original exception as a suppressed exceptionThis is all much more complicated than it needs to be and is the result of over-eager behavior on the part of
ContinuingInputStreamand a missing null check inAutoContinuingInputStream#close. The resulting exception looks like this:Instead, we'd rather just throw
javax.net.ssl.SSLException: SSL peer shut down incorrectlyand call it a day. This PR fixes that situation and adds a test for verifying that an exception rethrown byInputStreamContinuator#buildContinuationis rethrown as-is.This PR also makes
ContinuingInputStreameasier to use by removing the automatic calls todiscardWrapped()on any exception so some redundanttrystatements have also been removed.