diff options
| author | chrislu <chris.lu@gmail.com> | 2022-08-17 12:42:03 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-08-17 12:42:03 -0700 |
| commit | 2b580a7566536fb229a50af94b67d9df46724f34 (patch) | |
| tree | 73bd8091568909116fbb83cb1c5400c9ee004333 /weed/filer/entry_codec.go | |
| parent | eaeb141b09326aa7c4d1d1e7b7f27e119d019f9c (diff) | |
| download | seaweedfs-2b580a7566536fb229a50af94b67d9df46724f34.tar.xz seaweedfs-2b580a7566536fb229a50af94b67d9df46724f34.zip | |
also migrate jsonpb
Diffstat (limited to 'weed/filer/entry_codec.go')
| -rw-r--r-- | weed/filer/entry_codec.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/filer/entry_codec.go b/weed/filer/entry_codec.go index 786ecea49..ce9c0484b 100644 --- a/weed/filer/entry_codec.go +++ b/weed/filer/entry_codec.go @@ -21,7 +21,7 @@ func (entry *Entry) DecodeAttributesAndChunks(blob []byte) error { message := &filer_pb.Entry{} - if err := proto.UnmarshalMerge(blob, message); err != nil { + if err := proto.Unmarshal(blob, message); err != nil { return fmt.Errorf("decoding value blob for %s: %v", entry.FullPath, err) } |
