diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-22 16:30:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 16:30:52 -0500 |
| commit | bc0e084f2d909eeeacbe17938cb1ef8dbc90f7a2 (patch) | |
| tree | a1d7fada738182c2eb8cd6993f33625ae704ba94 /vendor/google.golang.org/grpc/rpc_util.go | |
| parent | d3903a85910979d8212028cf814574047015db58 (diff) | |
| parent | 80c5962dba7f5ecd6b602aecd0df479bd04391b1 (diff) | |
| download | podman-bc0e084f2d909eeeacbe17938cb1ef8dbc90f7a2.tar.gz podman-bc0e084f2d909eeeacbe17938cb1ef8dbc90f7a2.tar.bz2 podman-bc0e084f2d909eeeacbe17938cb1ef8dbc90f7a2.zip | |
Merge pull request #13276 from rhatdan/containers-common
Add containers-common spec and command to podman
Diffstat (limited to 'vendor/google.golang.org/grpc/rpc_util.go')
| -rw-r--r-- | vendor/google.golang.org/grpc/rpc_util.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go index 87987a2e6..5d407b004 100644 --- a/vendor/google.golang.org/grpc/rpc_util.go +++ b/vendor/google.golang.org/grpc/rpc_util.go @@ -712,13 +712,11 @@ func recvAndDecompress(p *parser, s *transport.Stream, dc Decompressor, maxRecei if err != nil { return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err) } - } else { - size = len(d) - } - if size > maxReceiveMessageSize { - // TODO: Revisit the error code. Currently keep it consistent with java - // implementation. - return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", size, maxReceiveMessageSize) + if size > maxReceiveMessageSize { + // TODO: Revisit the error code. Currently keep it consistent with java + // implementation. + return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message after decompression larger than max (%d vs. %d)", size, maxReceiveMessageSize) + } } return d, nil } |