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

fix register config not take effect because of url simplified #4397

Merged
merged 1 commit into from
Sep 16, 2019

Conversation

imsunv
Copy link
Contributor

@imsunv imsunv commented Jun 26, 2019

fix #4341

when set dubbo.registry.simplified true. the dubbo.service.register won't take effect because of the register key was simplified and will use default value true;

boolean register = registeredProviderUrl.getParameter("register", true);

change providerUrl here

Copy link
Member

@beiwei30 beiwei30 left a comment

Choose a reason for hiding this comment

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

LGTM, will merge when CI passes.

Pls. check my comment below, I realized your change causes CI failure.

Copy link
Member

@beiwei30 beiwei30 left a comment

Choose a reason for hiding this comment

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

pls. check my comment.

@cvictory cvictory added this to the 2.7.4 milestone Sep 9, 2019
@cvictory
Copy link
Contributor

cvictory commented Sep 9, 2019

@imsunv Can you remove unused import sentence ?

@imsunv
Copy link
Contributor Author

imsunv commented Sep 9, 2019

@cvictory ok

@codecov-io
Copy link

codecov-io commented Sep 9, 2019

Codecov Report

Merging #4397 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #4397      +/-   ##
============================================
+ Coverage     63.96%   63.97%   +0.01%     
  Complexity      452      452              
============================================
  Files           769      769              
  Lines         33206    33206              
  Branches       5237     5237              
============================================
+ Hits          21239    21244       +5     
+ Misses         9546     9543       -3     
+ Partials       2421     2419       -2
Impacted Files Coverage Δ Complexity Δ
...e/dubbo/registry/integration/RegistryProtocol.java 82.69% <100%> (ø) 0 <0> (ø) ⬇️
...e/dubbo/remoting/transport/netty/NettyChannel.java 55.68% <0%> (-4.55%) 20% <0%> (-1%)
.../dubbo/remoting/transport/netty4/NettyChannel.java 64.77% <0%> (-2.28%) 0% <0%> (ø)
...rg/apache/dubbo/common/timer/HashedWheelTimer.java 62.75% <0%> (+0.34%) 0% <0%> (ø) ⬇️
...he/dubbo/registry/multicast/MulticastRegistry.java 69.68% <0%> (+0.45%) 0% <0%> (ø) ⬇️
...dubbo/metadata/support/AbstractMetadataReport.java 72.83% <0%> (+1.73%) 0% <0%> (ø) ⬇️
...g/apache/dubbo/rpc/protocol/rest/RestProtocol.java 71.31% <0%> (+3.1%) 0% <0%> (ø) ⬇️
...he/dubbo/remoting/transport/netty/NettyServer.java 73.21% <0%> (+3.57%) 9% <0%> (+1%) ⬆️

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 7d564e7...b905448. Read the comment docs.

* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dubbo.registry.integration;
Copy link
Contributor

Choose a reason for hiding this comment

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

显示整个文件变化了,这个没法看啊。能处理下吗?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

调不回来了,我重新开个Pr 吧

@imsunv imsunv force-pushed the fix_url_register_config branch 6 times, most recently from 5b17fc2 to cbb30ac Compare September 12, 2019 05:09
@imsunv
Copy link
Contributor Author

imsunv commented Sep 12, 2019

@cvictory RegistryDirectory in master Line separator is CRLF, it will change to LF when committing

@imsunv
Copy link
Contributor Author

imsunv commented Sep 12, 2019

fixed it by keep Line separator with CRLF

@imsunv
Copy link
Contributor Author

imsunv commented Sep 12, 2019

@beiwei30 already fixed

Copy link
Contributor

@cvictory cvictory left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@cvictory cvictory left a comment

Choose a reason for hiding this comment

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

LGTM

@cvictory cvictory requested review from beiwei30 and removed request for beiwei30 September 16, 2019 06:25
@cvictory cvictory merged commit 470cc55 into apache:master Sep 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dubbo.registry.simplified=true and the register config won't take effect
4 participants