potyarkin/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Pull requests Activity

Merge pull request #61 from nspcc-dev/fix-putrequest-cid-npe

Browse source 
Fix NPE in PutRequest.CID()
This commit is contained in:
Evgeniy Kulikov 2020-04-03 18:30:56 +03:00 committed by GitHub
commit 4f6121986e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
object/service.go
View file

@ -127,7 +127,9 @@ func (m *PutRequest) NotFull() bool { return checkIsNotFull(m) }
// CID returns container id value from object put request. // CID returns container id value from object put request.
func (m *PutRequest) CID() CID { func (m *PutRequest) CID() CID {
if header := m.GetHeader(); header != nil { if header := m.GetHeader(); header != nil {
return header.Object.SystemHeader.CID if obj := header.GetObject(); obj != nil {
return obj.SystemHeader.CID
}
} }
return refs.CID{} return refs.CID{}
} }

2
object/service_test.go
View file

@ -16,6 +16,7 @@ func TestRequest(t *testing.T) {
&DeleteRequest{}, &DeleteRequest{},
&GetRangeRequest{}, &GetRangeRequest{},
&GetRangeHashRequest{}, &GetRangeHashRequest{},
MakePutRequestHeader(nil, nil),
} }
types := []RequestType{ types := []RequestType{
@ -26,6 +27,7 @@ func TestRequest(t *testing.T) {
RequestDelete, RequestDelete,
RequestRange, RequestRange,
RequestRangeHash, RequestRangeHash,
RequestPut,
} }
for i := range cases { for i := range cases {