@@ -1083,8 +1083,7 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
10831083 // Only initialize this state once per stream.
10841084 a .decompSet = true
10851085 }
1086- err = recv (a .p , cs .codec , a .s , a .dc , m , * cs .callInfo .maxReceiveMessageSize , payInfo , a .decomp )
1087- if err != nil {
1086+ if err := recv (a .p , cs .codec , a .s , a .dc , m , * cs .callInfo .maxReceiveMessageSize , payInfo , a .decomp , false ); err != nil {
10881087 if err == io .EOF {
10891088 if statusErr := a .s .Status ().Err (); statusErr != nil {
10901089 return statusErr
@@ -1122,8 +1121,7 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
11221121 }
11231122 // Special handling for non-server-stream rpcs.
11241123 // This recv expects EOF or errors, so we don't collect inPayload.
1125- err = recv (a .p , cs .codec , a .s , a .dc , m , * cs .callInfo .maxReceiveMessageSize , nil , a .decomp )
1126- if err == nil {
1124+ if err := recv (a .p , cs .codec , a .s , a .dc , m , * cs .callInfo .maxReceiveMessageSize , nil , a .decomp , false ); err == nil {
11271125 return toRPCErr (errors .New ("grpc: client streaming protocol violation: get <nil>, want <EOF>" ))
11281126 }
11291127 if err == io .EOF {
@@ -1423,8 +1421,7 @@ func (as *addrConnStream) RecvMsg(m any) (err error) {
14231421 // Only initialize this state once per stream.
14241422 as .decompSet = true
14251423 }
1426- err = recv (as .p , as .codec , as .s , as .dc , m , * as .callInfo .maxReceiveMessageSize , nil , as .decomp )
1427- if err != nil {
1424+ if err := recv (as .p , as .codec , as .s , as .dc , m , * as .callInfo .maxReceiveMessageSize , nil , as .decomp , false ); err != nil {
14281425 if err == io .EOF {
14291426 if statusErr := as .s .Status ().Err (); statusErr != nil {
14301427 return statusErr
@@ -1444,8 +1441,7 @@ func (as *addrConnStream) RecvMsg(m any) (err error) {
14441441
14451442 // Special handling for non-server-stream rpcs.
14461443 // This recv expects EOF or errors, so we don't collect inPayload.
1447- err = recv (as .p , as .codec , as .s , as .dc , m , * as .callInfo .maxReceiveMessageSize , nil , as .decomp )
1448- if err == nil {
1444+ if err := recv (as .p , as .codec , as .s , as .dc , m , * as .callInfo .maxReceiveMessageSize , nil , as .decomp , false ); err == nil {
14491445 return toRPCErr (errors .New ("grpc: client streaming protocol violation: get <nil>, want <EOF>" ))
14501446 }
14511447 if err == io .EOF {
@@ -1715,7 +1711,7 @@ func (ss *serverStream) RecvMsg(m any) (err error) {
17151711 if len (ss .statsHandler ) != 0 || len (ss .binlogs ) != 0 {
17161712 payInfo = & payloadInfo {}
17171713 }
1718- if err := recv (ss .p , ss .codec , ss .s , ss .dc , m , ss .maxReceiveMessageSize , payInfo , ss .decomp ); err != nil {
1714+ if err := recv (ss .p , ss .codec , ss .s , ss .dc , m , ss .maxReceiveMessageSize , payInfo , ss .decomp , true ); err != nil {
17191715 if err == io .EOF {
17201716 if len (ss .binlogs ) != 0 {
17211717 chc := & binarylog.ClientHalfClose {}
0 commit comments