github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added nil check for map

pull/17754/head
Vijay Srinivas 2023-06-29 15:55:42 +05:30 committed by Vijay
parent b3e2ec1cca
commit 8d0e9a5490
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/ui_endpoint.go
View File

@ -137,6 +137,9 @@ RPC:
// If not, get it from mapAddrVer. // If not, get it from mapAddrVer.
if _, ok := info.Meta[structs.MetaConsulVersion]; !ok { if _, ok := info.Meta[structs.MetaConsulVersion]; !ok {
if _, okver := mapAddrVer[info.Address]; okver { if _, okver := mapAddrVer[info.Address]; okver {
if info.Meta == nil {
info.Meta = make(map[string]string)
}
info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address] info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address]
} }
} }
@ -159,6 +162,9 @@ RPC:
// If not, get it from mapAddrVer. // If not, get it from mapAddrVer.
if _, ok := info.Meta[structs.MetaConsulVersion]; !ok { if _, ok := info.Meta[structs.MetaConsulVersion]; !ok {
if _, okver := mapAddrVer[info.Address]; okver { if _, okver := mapAddrVer[info.Address]; okver {
if info.Meta == nil {
info.Meta = make(map[string]string)
}
info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address] info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address]
} }
} }
@ -265,6 +271,9 @@ RPC:
// If not, get it from mapAddrVer. // If not, get it from mapAddrVer.
if _, ok := info.Meta[structs.MetaConsulVersion]; !ok { if _, ok := info.Meta[structs.MetaConsulVersion]; !ok {
if _, okver := mapAddrVer[info.Address]; okver { if _, okver := mapAddrVer[info.Address]; okver {
if info.Meta == nil {
info.Meta = make(map[string]string)
}
info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address] info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address]
} }
} }