-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
netty: Eliminate buffer release when there is an error as caller still owns the buffer. #10537
Changes from 1 commit
80df75d
426f1e6
6d97e70
4696ad5
2d4f1a2
9a46d9e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -537,7 +537,7 @@ public CompositeByteBuf addFlattenedComponents(boolean increaseWriterIndex, | |
} catch (UnsupportedOperationException actualError) { | ||
assertSame(expectedError, actualError); | ||
// Input must be released unless its ownership has been to the composite cumulation. | ||
assertEquals(0, in.refCnt()); | ||
assertEquals(1, in.refCnt()); | ||
// Tail released | ||
assertEquals(0, tail.refCnt()); | ||
// Composite cumulation is retained | ||
|
@@ -546,6 +546,7 @@ public CompositeByteBuf addFlattenedComponents(boolean increaseWriterIndex, | |
assertEquals(0, compositeThrows.numComponents()); | ||
} finally { | ||
compositeThrows.release(); | ||
in.release(); | ||
} | ||
} | ||
|
||
|
@@ -573,7 +574,7 @@ public CompositeByteBuf addFlattenedComponents(boolean increaseWriterIndex, | |
} catch (UnsupportedOperationException actualError) { | ||
assertSame(expectedError, actualError); | ||
// Input must be released unless its ownership has been to the composite cumulation. | ||
assertEquals(0, in.refCnt()); | ||
assertEquals(1, in.refCnt()); | ||
// New buffer released | ||
assertEquals(0, newTail.refCnt()); | ||
// Composite cumulation is retained | ||
|
@@ -582,6 +583,7 @@ public CompositeByteBuf addFlattenedComponents(boolean increaseWriterIndex, | |
assertEquals(0, compositeRo.numComponents()); | ||
} finally { | ||
compositeRo.release(); | ||
in.release(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we should keep it above There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need to release when there is an error since the new paradigm is that only successes change ownership. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Discussed IRL, we do want to move it, but to another place |
||
} | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should keep it above
fail("Cumulator didn't throw");
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is expected the in the case of an error that the ownership remained with the calling method so it is this method's responsibility to do the release.