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.

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

return null when EmptyResultDataAccessException occurred for ldap scenarios #3430

Merged
merged 1 commit into from
Dec 12, 2020

Conversation

nobodyiam
Copy link
Member

What's the purpose of this PR

fix the issue that unexpected exception occurred when the searched user doesn't exist in the ldap system.

Which issue(s) this PR fixes:

Fixes #3394

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.

@codecov-io
Copy link

Codecov Report

Merging #3430 (20e6499) into master (f8683a2) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #3430      +/-   ##
============================================
- Coverage     51.40%   51.37%   -0.03%     
+ Complexity     2312     2311       -1     
============================================
  Files           441      441              
  Lines         13817    13821       +4     
  Branches       1407     1407              
============================================
- Hits           7102     7100       -2     
- Misses         6227     6232       +5     
- Partials        488      489       +1     
Impacted Files Coverage Δ Complexity Δ
...mework/apollo/portal/spi/ldap/LdapUserService.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...rk/apollo/spring/property/SpringValueRegistry.java 83.33% <0.00%> (-5.56%) 10.00% <0.00%> (-1.00%)
.../apollo/internals/RemoteConfigLongPollService.java 77.71% <0.00%> (-0.61%) 28.00% <0.00%> (-1.00%)
...ervice/service/ReleaseMessageServiceWithCache.java 85.88% <0.00%> (+1.17%) 24.00% <0.00%> (+1.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f8683a2...20e6499. Read the comment docs.

@nobodyiam nobodyiam merged commit 03bc4b4 into apolloconfig:master Dec 12, 2020
@Anilople Anilople added the area/portal apollo-portal label Dec 23, 2020
@nobodyiam nobodyiam added this to the 1.8.0 milestone Feb 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/portal apollo-portal
Projects
None yet
Development

Successfully merging this pull request may close these issues.

使用中的portal接入ldap后token无法写入
3 participants