Fix JRubyException message access #1344
Closed
Conversation
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
(cherry picked from commit eaf8078)
For SPR-14863 we need to adjust the code generation for OpNE to use !x.equals(y) rather than x!=y. There are also further cases in the equalityCheck() code in Operator that were not being handled in the compilation case (when comparators are used for example). This latter issue also affects OpEQ. Rather than add yet more bytecode generation, both OpNE and OpEQ generateCode() methods have been simplified. The generated code now delegates to equalityCheck() in Operator which is exactly what the interpreted case does. This ensures that the compiled code continues to behave just like the interpreted case. It ensures changes to the interpreted case are automatically picked up for the compiled case. It makes the bytecode generation simpler. The benefit of compilation of SpEL expressions is to avoid slow reflective calls - that doesn't apply for a basic (in)equality test so there is no need to go crazy in bytecode gen. Issue: SPR-14863 (cherry picked from commit 9000acd)
This commits adds a validation check whether the SockJS session type matches the transport type and rejects requests for which they don't match. Issue: SPR-14867
…older Issue: SPR-14583 (cherry picked from commit 03468fd)
…ations Issue: SPR-10502 (cherry picked from commit 8053fef)
Issue: SPR-14879 (cherry picked from commit 8ae0bd6)
Issue: SPR-14881 (cherry picked from commit 8df45dd)
…ons) Issue: SPR-14883
Issue: SPR-14883
Issue: SPR-14886 (cherry picked from commit 3a29daa)
Do not check on non-specified port when scheme is https. Enables SSL for https URIs with a specified port. Issue: SPR-14889
Issue: SPR-15262 (cherry picked from commit 74bdcd8)
Prior to this commit, the `ShallowEtagHeaderFilter` could participate in the response and set its ETag/Content-Length headers, even for HEAD requests. Since the response body is empty, the filter implementation would set a `"Content-Length: 0"`. The RFC states that responses to HEAD requests should exhibit identical response headers to GET (with the possible exception of payload related headers such as Content-Length. With this commit, `ShallowEtagHeaderFilter` now ignores HEAD requests since the proper values may be set already for payload related headers by the handler. The filter has no way to generate a proper ETag value nor calculate the content length without the actual body. Issue: SPR-15261 (cherry picked from commit b732251)
This commit improves `AbstractValueAdaptingCache` to throw a dedicated exception if `allowNullValues` is `false` and a `null` value is provided anyway. This avoid a lower-level exception from the cache library that will miss some context. Issue: SPR-15173
This reverts commit fd568f3.
…again) Issue: SPR-15214 (cherry picked from commit fc11321)
Issue: SPR-15229
…dAnnotations Issue: SPR-15271 (cherry picked from commit 6108ab1)
…ryBeans Issue: SPR-15275 (cherry picked from commit 7fb0ad3)
Issue: SPR-15248
Also retrieves CacheConfig as merged annotation now, aligned with other caching annotations. Issue: SPR-15296 (cherry picked from commit d4a1b59)
…IB proxies) Issue: SPR-15271 Issue: SPR-14949 Issue: SPR-14322 (cherry picked from commit d003f66)
|
@wltjr Please sign the Contributor License Agreement! Click here to manually synchronize the status of this Pull Request. See the FAQ for frequently asked questions. |
|
Thanks for the PR. please resubmit with master, we are taking care of backports anyway. |
|
The file has been removed from master. I resubmitted against the 4.3.x branch |
|
I've addressed this through a slightly different revision, retaining compatibility with JRuby 1.7.x while also allowing Note that we primarily support JRuby 9000 through JSR-223, i.e. |
|
Ok sounds good |
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.
I do not think I created this PR properly but maybe. Newer JRuby changed access on message in JRubyException to private. This causes an error when attempting to use a private variable in public scope. I changed it from .message to ex.getMessage(). Also removed null check, as it is only needed on the JRubyException object.
If the PR is in fact improperly created, let me know and I will attempt to recreate/resubmit properly. This pertains to 4.3.7 release/branch.