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:constructor timeout not function #721

Merged
merged 182 commits into from
Apr 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
6b06a52
fix #142 delete defaultEventExecutorGroup
slievrly Jan 17, 2019
9a11a85
fix #139 netty heartbeat configurable
slievrly Jan 17, 2019
4592899
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 17, 2019
c77da16
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 17, 2019
80c5e2b
fix #149 (long)->Number.longValue
slievrly Jan 17, 2019
91acb36
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 18, 2019
e10063c
release 0.1.1 (#178)
slievrly Jan 18, 2019
21bd340
revert OrderServiceImpl, change version 0.1.2-SNAPSHOT
slievrly Jan 18, 2019
0fd85b5
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 21, 2019
b94fc78
fix #201 add sample module sql script
slievrly Jan 21, 2019
b745c9f
fix #206 optimize sample log print location.
slievrly Jan 21, 2019
df4edcd
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 22, 2019
471aa19
fix #213 sample OrderServiceImpl long->longValue()
slievrly Jan 22, 2019
0a53550
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 23, 2019
8f59abf
fix #233 add package jvmSettings
slievrly Jan 23, 2019
d176782
add unit test for some request class (#239)
summerjava Jan 23, 2019
db61c3c
Revert "add unit test for some request class (#239)" (#240)
slievrly Jan 23, 2019
b503180
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 23, 2019
c952557
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 23, 2019
903e289
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 24, 2019
bd021ef
fix #271 add FileConfigurationTest,add addConfigListener removeConfig…
slievrly Jan 24, 2019
0f665a5
fix #271 add FileConfigurationTest,add addConfigListener removeConfig…
slievrly Jan 24, 2019
22a3b8e
update package pom
slievrly Jan 25, 2019
e073b2e
update package pom
slievrly Jan 25, 2019
5987b66
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 25, 2019
5b8c8b0
release 0.1.2 (#294)
slievrly Jan 25, 2019
f1d2df6
release 0.1.2 (#296)
slievrly Jan 25, 2019
2075b7e
Merge remote-tracking branch 'upstream/master' into develop
slievrly Jan 25, 2019
17d1097
release 0.1.2
slievrly Jan 25, 2019
5fc9375
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Jan 25, 2019
027c3ee
release 0.1.2
slievrly Jan 25, 2019
1f37de3
release 0.1.2 (#301)
slievrly Jan 25, 2019
19bc970
Merge branch 'develop' of github.com:slievrly/fescar into dev_1_28
slievrly Jan 28, 2019
a7a06f0
update mvn package
slievrly Jan 28, 2019
7d9023c
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Jan 29, 2019
08f2f8b
fix #325 GlobalTransactionContext.clean in finally,change version to …
slievrly Jan 29, 2019
9895abb
release 0.1.3
slievrly Jan 29, 2019
3faef44
release 0.1.3
slievrly Jan 29, 2019
21a4662
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Jan 29, 2019
d5fc56d
release 0.1.3
slievrly Jan 29, 2019
773c7f5
release 0.1.3
slievrly Jan 29, 2019
cca20cd
release 0.1.3
slievrly Jan 29, 2019
f385ae2
change version 0.1.4-SNAPSHOT
slievrly Jan 29, 2019
6c4dbbb
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Jan 30, 2019
d87531f
remove examples module
slievrly Jan 30, 2019
b294284
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Jan 31, 2019
db32fad
remove fescar-client dependency on fescar-all pom
slievrly Jan 31, 2019
c820aab
support nacos registry and config
slievrly Feb 2, 2019
726fe09
Merge remote-tracking branch 'upstream/develop' into temp_2_2
slievrly Feb 2, 2019
a60548a
Merge remote-tracking branch 'upstream/develop' into temp_2_2
slievrly Feb 2, 2019
a02bf9c
fix #322 remove NettyServerConfig#CONFIG
slievrly Feb 2, 2019
e26eba6
Merge remote-tracking branch 'upstream/develop' into temp_2_2
slievrly Feb 3, 2019
b816656
fix #361 dependency jdk upgrade 1.8
slievrly Feb 3, 2019
bbf1b67
Update README.md
slievrly Feb 10, 2019
b4f53c5
Merge remote-tracking branch 'upstream/develop' into temp_2_2
slievrly Feb 10, 2019
b79f18b
Merge branch 'develop' of github.com:slievrly/fescar into temp_2_2
slievrly Feb 10, 2019
c63b437
fix #368 update Readme.md FESCAR-> Fescar
slievrly Feb 10, 2019
d871163
Merge remote-tracking branch 'upstream/develop' into temp_2_2
slievrly Feb 11, 2019
67b83af
Merge branch 'develop' of github.com:slievrly/fescar into dev_1_28
slievrly Feb 11, 2019
ac6beaf
release 0.1.4 (#377)
slievrly Feb 11, 2019
6a743c0
code format and not skip javadoc (#379)
slievrly Feb 11, 2019
85d839a
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 11, 2019
08e3186
fix #371 fescar support nacos registry and config
slievrly Feb 13, 2019
5a6172b
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 14, 2019
77460a2
fix #394 rename discover module to discovery
slievrly Feb 14, 2019
a5df9c0
fix #399 NacosConfiguration getConfig null or not exist should return…
slievrly Feb 14, 2019
06a0ba1
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 14, 2019
439d27a
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 14, 2019
c41e587
fix #401 release 0.2.0
slievrly Feb 14, 2019
34b6115
fix #403 [master] release 0.2.0 (#404)
slievrly Feb 14, 2019
9a437cc
fix #405 change version to 0.2.1-SNAPSHOT
slievrly Feb 14, 2019
71856a6
add javadoc
slievrly Feb 14, 2019
37ce006
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 15, 2019
d988256
fix #409 update javadoc and dependency
slievrly Feb 15, 2019
3005ad9
fix #416 #417 add dubbo-alibaba module support Alibaba Dubbo, fix fes…
slievrly Feb 18, 2019
c828b61
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 18, 2019
0037768
release 0.2.1
slievrly Feb 18, 2019
ecb2008
release 0.2.1
slievrly Feb 18, 2019
f064095
[master] release 0.2.1 (#421)
slievrly Feb 18, 2019
93f4e14
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 19, 2019
c3e134c
fix #425 change version to 0.2.2-SNAPSHOT
slievrly Feb 19, 2019
3c9a63f
fix #427 update Readme.md release version to 0.2.1
slievrly Feb 19, 2019
7151f0b
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 20, 2019
a20ecb5
fix #415 transId needs to recycle
slievrly Feb 20, 2019
bebc502
fix #442 add fescar-server module logback.xml
slievrly Feb 22, 2019
57f182f
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 22, 2019
715c84b
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 22, 2019
6f023bc
fix #444 specification uses SPI ServiceLoader
slievrly Feb 22, 2019
3a4fdbc
add CONTRIBUTING about code style
slievrly Feb 22, 2019
aa7b030
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 22, 2019
cfe6d67
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 22, 2019
0c49f7a
#448 release 0.2.2
slievrly Feb 22, 2019
84cd529
fix #450 [master] release 0.2.2 (#451)
slievrly Feb 22, 2019
68a9383
fix #454 update Readme.md release version
slievrly Feb 23, 2019
59ab1da
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 23, 2019
a0d8d8f
fix #457 change version to 0.2.3-SNAPSHOT
slievrly Feb 25, 2019
a715fa4
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 25, 2019
ebf3e87
fix #460 move the public configkey to ConfigurationKeys
slievrly Feb 26, 2019
b9393cb
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 26, 2019
38f8218
fix #462 Separation configuration and registration judgment
slievrly Feb 26, 2019
2a5bcd7
format javadoc
slievrly Feb 26, 2019
5541513
fix #464 format config module javadoc
slievrly Feb 26, 2019
5c86c39
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Feb 26, 2019
7da64f1
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Mar 1, 2019
30dd59e
fix #491 release 0.2.3
slievrly Mar 1, 2019
50af0be
fix #491 [master]release 0.2.3 (#493)
slievrly Mar 1, 2019
ca20084
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Mar 4, 2019
958084b
fix #500 change version to 0.2.4-SNAPSHOT
slievrly Mar 4, 2019
bb42b14
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Mar 5, 2019
8c75a33
remove useless
slievrly Mar 5, 2019
7cc6527
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Mar 6, 2019
a08b246
fix #530 remove useless, format and javadoc for common module
slievrly Mar 6, 2019
e16c7d5
fix #532 remove useless, format and javadoc for config module
slievrly Mar 6, 2019
81f3de0
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Mar 6, 2019
2be4e03
fix #533 remove useless, format and javadoc for discovery module
slievrly Mar 6, 2019
d095dad
fix #536 remove useless, format and javadoc for test、dubbo、spring and…
slievrly Mar 6, 2019
c026bf9
fix #538 remove useless, format and javadoc for rm and tm module
slievrly Mar 6, 2019
afb852c
fix #540 remove useless, format and javadoc for core module
slievrly Mar 6, 2019
5612c89
fix #560 release 0.3.0
slievrly Mar 8, 2019
73a31d1
fix #560 release 0.3.0
slievrly Mar 8, 2019
3c8cc7c
Merge remote-tracking branch 'origin/develop' into dev_1_28
slievrly Mar 8, 2019
9a256ab
release 0.3.0 (#562)
slievrly Mar 8, 2019
fafedf6
fix #578 change version to 0.3.1-SNAPSHOT
slievrly Mar 12, 2019
fec6000
fix #578 change version to 0.3.1-SNAPSHOT
slievrly Mar 12, 2019
d942bd0
Merge remote-tracking branch 'origin/develop' into dev_1_28
slievrly Mar 12, 2019
89f4bd6
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Mar 12, 2019
7036fd0
fix #580 update Readme.md release version to 0.3.0
slievrly Mar 12, 2019
1bc4c82
[Test-1] Add test cases for ConfigurationFactory (#570)
xingfudeshi Mar 12, 2019
27f75eb
fix up ,eureka client renew request is error#569 (#571)
sunrui849 Mar 12, 2019
c0c891d
[Test-1] Add unit test cases to BranchStatus, BranchType and GlobalSt…
lay-g Mar 12, 2019
28a4de6
fix ConfigType NPE (#551)
sofay Mar 13, 2019
802a245
fix #597 Code optimization meet p3c code checking rules
slievrly Mar 14, 2019
92e5669
Merge remote-tracking branch 'upstream/develop' into dev_1_28
slievrly Mar 14, 2019
8a77623
fix #600 arrange registry.conf
slievrly Mar 14, 2019
1e64826
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 14, 2019
b15ddf9
resolve registry.conf conflicts
slievrly Mar 15, 2019
8521fb7
resolve registry.conf conflicts
slievrly Mar 15, 2019
575704b
Merge remote-tracking branch 'origin/develop' into develop
slievrly Mar 15, 2019
5a1af5a
release 0.3.1
slievrly Mar 15, 2019
2dce4de
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 15, 2019
4d9f405
resolve conflicts with upstream/master
slievrly Mar 15, 2019
3b6665a
resolve conflicts with upstream/master
slievrly Mar 15, 2019
7c48fd4
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 15, 2019
16128ec
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 15, 2019
2900b2b
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 17, 2019
75fa1a3
fix #614 Optimized code to meet p3c minimumPriority=2
slievrly Mar 17, 2019
83883f9
fix #614 Optimized code to meet p3c minimumPriority=2
slievrly Mar 17, 2019
4130f6f
Merge remote-tracking branch 'origin/develop' into develop
slievrly Mar 17, 2019
f17a28a
fix #618 change version to 0.4.0-SNAPSHOT
slievrly Mar 18, 2019
1a02770
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 18, 2019
4da5692
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 19, 2019
65a0d77
fix #626 Optimization dependency
slievrly Mar 19, 2019
9f25422
fix #626 Optimization dependency
slievrly Mar 19, 2019
da5781d
Merge remote-tracking branch 'origin/develop' into develop
slievrly Mar 19, 2019
3a79156
release 0.4.0
slievrly Mar 19, 2019
ecfd8db
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 19, 2019
381f225
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 19, 2019
fe909e4
fix #633 change version to 0.4.1-SNAPSHOT
slievrly Mar 20, 2019
a45eb64
skip javadoc
slievrly Mar 20, 2019
77cfd0c
remove useless
slievrly Mar 20, 2019
1fac4fc
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 21, 2019
2af38f3
fix #642 ignore testIsTimeout UT failed in java11 and update readme
slievrly Mar 21, 2019
23b2562
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 28, 2019
9cce8e8
fix #686 update Readme.md maven dependency
slievrly Mar 29, 2019
9aeeed4
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 29, 2019
da63a5f
fix #690 change file configuration default cluster name
slievrly Mar 29, 2019
37b0438
fix #692 change ping log level and delete useless files
slievrly Mar 29, 2019
fef48b7
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 29, 2019
123796c
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 29, 2019
ff03238
release 0.4.1
slievrly Mar 29, 2019
fdb4cfc
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Mar 31, 2019
fb497df
fix #702 add author info
slievrly Mar 31, 2019
18eb583
docs:update readme.md
slievrly Apr 2, 2019
03d443b
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Apr 2, 2019
35e11bc
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Apr 2, 2019
045f21b
docs:update readme.md
slievrly Apr 2, 2019
9ff38d1
update the icons
lovepoem Apr 2, 2019
4a69349
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Apr 3, 2019
58fcf3d
bugfix:add nacos init config and some config
slievrly Apr 3, 2019
3f6c69a
Merge remote-tracking branch 'origin/develop' into develop
slievrly Apr 3, 2019
a872ee8
Merge remote-tracking branch 'upstream/develop' into develop
slievrly Apr 3, 2019
edfbfef
bugfix:constructor timeout not function
slievrly Apr 3, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void run() {
configFuture.setResult(result);
}
});
return (String)configFuture.get(timeoutMills, TimeUnit.MILLISECONDS);
return (String)configFuture.get();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public boolean isTimeout() {
* @throws InterruptedException the interrupted exception
*/
public Object get() {
return get(DEFAULT_CONFIG_TIMEOUT, TimeUnit.MILLISECONDS);
return get(this.timeoutMills, TimeUnit.MILLISECONDS);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public FileConfiguration(String name) {
public String getConfig(String dataId, String defaultValue, long timeoutMills) {
ConfigFuture configFuture = new ConfigFuture(dataId, defaultValue, ConfigOperation.GET, timeoutMills);
configOperateExecutor.submit(new ConfigOperateRunnable(configFuture));
return (String)configFuture.get(timeoutMills, TimeUnit.MILLISECONDS);
return (String)configFuture.get();
}

@Override
Expand All @@ -109,14 +109,14 @@ public boolean putConfig(String dataId, String content, long timeoutMills) {
public boolean putConfigIfAbsent(String dataId, String content, long timeoutMills) {
ConfigFuture configFuture = new ConfigFuture(dataId, content, ConfigOperation.PUTIFABSENT, timeoutMills);
configOperateExecutor.submit(new ConfigOperateRunnable(configFuture));
return (Boolean)configFuture.get(timeoutMills, TimeUnit.MILLISECONDS);
return (Boolean)configFuture.get();
}

@Override
public boolean removeConfig(String dataId, long timeoutMills) {
ConfigFuture configFuture = new ConfigFuture(dataId, null, ConfigOperation.REMOVE, timeoutMills);
configOperateExecutor.submit(new ConfigOperateRunnable(configFuture));
return (Boolean)configFuture.get(timeoutMills, TimeUnit.MILLISECONDS);
return (Boolean)configFuture.get();
}

@Override
Expand Down