natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ApplicationConfig.enableFileCache default value is not true (#10880) (#11008)

This commit is contained in:
陈精华 2022-11-25 14:47:05 +08:00 committed by GitHub
parent c6a3f94118
commit 10082d3fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
View File

@ -244,6 +244,9 @@ public class ApplicationConfig extends AbstractConfig {
if (executorManagementMode == null) {
executorManagementMode = EXECUTOR_MANAGEMENT_MODE_DEFAULT;
}
if (enableFileCache == null) {
enableFileCache = Boolean.TRUE;
}
}
@Parameter(key = APPLICATION_KEY, required = true)

20
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java
View File

@ -29,7 +29,9 @@ import java.util.HashMap;
import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO;
import static org.apache.dubbo.common.constants.CommonConstants.DUMP_DIRECTORY;
import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_MANAGEMENT_MODE_DEFAULT;
import static org.apache.dubbo.common.constants.QosConstants.ACCEPT_FOREIGN_IP;
import static org.apache.dubbo.common.constants.QosConstants.QOS_ENABLE;
import static org.hamcrest.MatcherAssert.assertThat;
@ -333,4 +335,20 @@ class ApplicationConfigTest {
DubboBootstrap.getInstance().destroy();
}
}
@Test
void testDefaultValue() {
SysProps.setProperty("dubbo.application.NAME", "demo-app");
DubboBootstrap.getInstance()
.initialize();
ApplicationConfig applicationConfig = DubboBootstrap.getInstance().getApplication();
Assertions.assertEquals(DUBBO, applicationConfig.getProtocol());
Assertions.assertEquals(EXECUTOR_MANAGEMENT_MODE_DEFAULT, applicationConfig.getExecutorManagementMode());
Assertions.assertEquals(Boolean.TRUE, applicationConfig.getEnableFileCache());
DubboBootstrap.getInstance().destroy();
}
}

1
dubbo-config/dubbo-config-api/src/test/resources/dubbo.properties
View File

@ -1,4 +1,3 @@
dubbo.override.key2=properties
dubbo.override.protocol=properties
dubbo.application.enable-file-cache=false
dubbo.service.shutdown.wait=200