zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #664 from paderlol/develop

Browse Source 
Fix update instance info NPE #663
This commit is contained in:
Fury Zhu 2019-01-20 22:04:57 +08:00 committed by GitHub
commit ad4f63ebe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
View File

@ -315,7 +315,7 @@ public class DomainsManager {
try { try {
if (!dom.getEnableClientBeat()) { if (!dom.getEnableClientBeat()) {
getDom2LockMap().get(domName).lock(); getDom2LockMap().get(UtilsAndCommons.assembleFullServiceName(namespaceId, domName)).lock();
} }
Datum datum1 = RaftCore.getDatum(UtilsAndCommons.getIPListStoreKey(dom)); Datum datum1 = RaftCore.getDatum(UtilsAndCommons.getIPListStoreKey(dom));
@ -389,7 +389,7 @@ public class DomainsManager {
RaftCore.onPublish(datum, peer, increaseTerm); RaftCore.onPublish(datum, peer, increaseTerm);
} finally { } finally {
if (!dom.getEnableClientBeat()) { if (!dom.getEnableClientBeat()) {
getDom2LockMap().get(domName).unlock(); getDom2LockMap().get(UtilsAndCommons.assembleFullServiceName(namespaceId, domName)).unlock();
} }
} }