Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixes exit context when request is blocked in springwebmvc adaptor #1353

Merged
merged 6 commits into from
Mar 24, 2020
Merged

Fixes exit context when request is blocked in springwebmvc adaptor #1353

merged 6 commits into from
Mar 24, 2020

Commits on Mar 9, 2020

  1. Add "web-context-unify" configuration to support "chain" relation flo… 

    …w strategy in Spring webmvc adapter.
    @cdfive
    cdfive committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    e8b2978 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. Merge remote-tracking branch 'Sentinel/master' 

    # Conflicts:
#	sentinel-adapter/sentinel-spring-webmvc-adapter/src/main/java/com/alibaba/csp/sentinel/adapter/spring/webmvc/config/SentinelWebMvcConfig.java
#	sentinel-demo/sentinel-demo-spring-webmvc/src/main/java/com/alibaba/csp/sentinel/demo/spring/webmvc/config/InterceptorConfig.java
    @cdfive
    cdfive committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    43ecd46 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Merge remote-tracking branch 'Sentinel/master'

    @cdfive
    cdfive committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    f2286e0 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. Merge remote-tracking branch 'Sentinel/master'

    @cdfive
    cdfive committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    1fbb107 View commit details
    Browse the repository at this point in the history

  2. Exit context if request is blocked and improve test case.

    @cdfive
    cdfive committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    65ff676 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Using try finally block, since user may need the context in the block… 

    … handler
    @cdfive
    cdfive committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    84dfe5e View commit details
    Browse the repository at this point in the history