| commit | 6e095998aea3027192cc3f412407c453deaa2ae0 | [log] [tgz] |
|---|---|---|
| author | Joe Tsai <joetsai@digital-static.net> | Sat Aug 10 13:56:36 2019 -0700 |
| committer | Joe Tsai <joetsai@digital-static.net> | Thu Sep 19 22:41:12 2019 +0000 |
| tree | dc13a1e7deb22027d2e636c2cb2ed5208a3682cf | |
| parent | fc5f8c340a1f4482e5f4ca4899ddd2cdbcdddeb7 [diff] [blame] |
proto, internal/impl: implement support for weak fields Change-Id: I0a3ff79542a3316295fd6c58e1447e597be97ab9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189923 Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/encoding/protojson/decode.go b/encoding/protojson/decode.go index faa56b0..db8a3df 100644 --- a/encoding/protojson/decode.go +++ b/encoding/protojson/decode.go
@@ -201,6 +201,8 @@ fd = nil // reset since field name is actually the message name } } + } + if flags.ProtoLegacy { if fd != nil && fd.IsWeak() && fd.Message().IsPlaceholder() { fd = nil // reset since the weak reference is not linked in }