-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Try to convince the JVM not to lose stacktraces #24426
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
Merged
nik9000
merged 1 commit into
elastic:master
from
nik9000:xx_omit_stack_trace_in_fast_throw
May 2, 2017
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -128,12 +128,13 @@ public static <T extends Throwable> T expectScriptThrows(Class<T> expectedType, | |
| if (e instanceof ScriptException) { | ||
| boolean hasEmptyScriptStack = ((ScriptException) e).getScriptStack().isEmpty(); | ||
| if (shouldHaveScriptStack && hasEmptyScriptStack) { | ||
| if (0 != e.getCause().getStackTrace().length) { | ||
| // Without -XX:-OmitStackTraceInFastThrow the jvm can eat the stack trace which causes us to ignore script_stack | ||
| AssertionFailedError assertion = new AssertionFailedError("ScriptException should have a scriptStack"); | ||
| assertion.initCause(e); | ||
| throw assertion; | ||
| } | ||
| /* If this fails you *might* be missing -XX:-OmitStackTraceInFastThrow in the test jvm | ||
| * In Eclipse you can add this by default by going to Preference->Java->Installed JREs, | ||
| * clicking on the default JRE, clicking edit, and adding the flag to the | ||
| * "Default VM Arguments". */ | ||
|
Member
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. A blank line above and below. 😄 |
||
| AssertionFailedError assertion = new AssertionFailedError("ScriptException should have a scriptStack"); | ||
| assertion.initCause(e); | ||
| throw assertion; | ||
| } else if (false == shouldHaveScriptStack && false == hasEmptyScriptStack) { | ||
| AssertionFailedError assertion = new AssertionFailedError("ScriptException shouldn't have a scriptStack"); | ||
| assertion.initCause(e); | ||
|
|
||
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.
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.
Sorry to nit, I think that this is cleaner for multi-line comments:
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 like the stately form of multiline comments for javadocs and really long comments that have to stand out but I tend to prefer this one for single line comments that happen to be long enough that they end up on multiple lines. Clear as mud?
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.
Indeed. 😐