Skip to content

[stable12] do not catch and ignore ServerNotAvailable in the wrong spot - #8074

Merged
MorrisJobke merged 1 commit into
stable12from
stable12-8069
Jan 27, 2018
Merged

[stable12] do not catch and ignore ServerNotAvailable in the wrong spot#8074
MorrisJobke merged 1 commit into
stable12from
stable12-8069

Conversation

@blizzz

Copy link
Copy Markdown
Member

backport of #8069

might cause the user to be unavailable (race condition).
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzzblizzz added this to the Nextcloud 12.0.6 milestone Jan 26, 2018
@codecov

codecovBot commented Jan 26, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8074 into stable12 will increase coverage by <.01%.
The diff coverage is 25%.

@@ Coverage Diff @@## stable12 #8074 +/- ##
==============================================
+ Coverage 53.84% 53.84% +<.01% - Complexity 22760 22761 +1 
==============================================
Files 1385 1385 Lines 87148 87150 +2 Branches 1331 1331 ==============================================
+ Hits 46926 46928 +2 
Misses 40222 40222
Impacted FilesCoverage ΔComplexity Δ
apps/user_ldap/lib/Access.php18.15% <ø> (ø)305 <0> (ø)⬇️
apps/user_ldap/lib/User_LDAP.php73.57% <25%> (-0.61%)74 <0> (+1)
apps/files_trashbin/lib/Trashbin.php72.28% <0%> (-0.25%)136% <0%> (ø)
core/js/js.js61.94% <0%> (+0.11%)0% <0%> (ø)⬇️
lib/private/Server.php84.8% <0%> (+0.12%)121% <0%> (ø)⬇️
lib/private/Files/Cache/Propagator.php96.2% <0%> (+1.26%)16% <0%> (ø)⬇️

@MorrisJobke
MorrisJobke merged commit bae874c into stable12Jan 27, 2018
@MorrisJobke
MorrisJobke deleted the stable12-8069 branch January 27, 2018 12:46
@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
2 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugfeature: ldap

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@rullzer@MorrisJobke