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

bugfix:fix the judgement of configuration condition #2312

Merged
merged 2 commits into from
Feb 27, 2020

Conversation

SevenSecondsOfMemory
Copy link
Contributor

fix seataAutoConfig enableAutoDataSourceProxy issue

@codecov-io
Copy link

codecov-io commented Feb 27, 2020

Codecov Report

Merging #2312 into develop will increase coverage by 0.01%.
The diff coverage is 66.66%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2312      +/-   ##
=============================================
+ Coverage       51.4%   51.42%   +0.01%     
- Complexity      2663     2666       +3     
=============================================
  Files            510      511       +1     
  Lines          16604    16627      +23     
  Branches        2033     2033              
=============================================
+ Hits            8536     8550      +14     
- Misses          7261     7269       +8     
- Partials         807      808       +1
Impacted Files Coverage Δ Complexity Δ
...ing/annotation/GlobalTransactionalInterceptor.java 9.85% <0%> (-0.15%) 2 <0> (ø)
.../java/io/seata/tm/api/transaction/Propagation.java 100% <100%> (ø) 1 <1> (?)
...a/io/seata/tm/api/transaction/TransactionInfo.java 88.46% <60%> (-6.78%) 14 <2> (+2)
...in/java/io/seata/tm/api/TransactionalTemplate.java 67.28% <60%> (-6.12%) 24 <0> (ø)
...java/io/seata/tm/api/DefaultGlobalTransaction.java 74.15% <77.77%> (+4.15%) 21 <3> (ø) ⬇️

@l81893521 l81893521 added the first-time contributor first-time contributor label Feb 27, 2020
Copy link
Contributor

@zjinlei zjinlei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@xingfudeshi
Copy link
Member

fixes #2290

Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@xingfudeshi xingfudeshi changed the title 1、fix seataAutoConfig bugfix:fix the judgement of configuration condition Feb 27, 2020
@zjinlei zjinlei merged commit 863b253 into apache:develop Feb 27, 2020
@slievrly slievrly added this to the 1.2.0 milestone Mar 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
first-time contributor first-time contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants