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

fix issue: unexport() throws NPE when register fail. (#10893)

This commit is contained in:
pandaapo 2022-11-09 10:08:03 +08:00 committed by GitHub
parent bb53fde978
commit 70660cb969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
View File

@ -72,6 +72,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.CLUSTER_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SPLIT_PATTERN;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_SERVER_SHUTDOWN_TIMEOUT;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_VERSION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.ENABLED_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.EXTRA_KEYS_KEY;
@ -919,7 +920,10 @@ public class RegistryProtocol implements Protocol, ScopeModelAware {
}
//TODO wait for shutdown timeout is a bit strange
int timeout = ConfigurationUtils.getServerShutdownTimeout(subscribeUrl.getScopeModel());
int timeout = DEFAULT_SERVER_SHUTDOWN_TIMEOUT;
if (subscribeUrl != null) {
timeout = ConfigurationUtils.getServerShutdownTimeout(subscribeUrl.getScopeModel());
}
executor.schedule(() -> {
try {
exporter.unexport();