summaryrefslogtreecommitdiffhomepage
path: root/pkg/urpc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-12-30 00:30:50 +0000
committergVisor bot <gvisor-bot@google.com>2020-12-30 00:30:50 +0000
commit34df6705c8bab411334c360361fbe52752c4cfd4 (patch)
tree6b8e38a90165fd17dbc095ae043f9543456b9b68 /pkg/urpc
parent691e097efcc99b0a1ff292abc32363cedab2f312 (diff)
parent85c1c3ed4b8d32c499c53917765acef20cb16248 (diff)
Merge release-20201208.0-91-g85c1c3ed4 (automated)
Diffstat (limited to 'pkg/urpc')
-rw-r--r--pkg/urpc/urpc.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkg/urpc/urpc.go b/pkg/urpc/urpc.go
index 13b2ea314..dfd23032c 100644
--- a/pkg/urpc/urpc.go
+++ b/pkg/urpc/urpc.go
@@ -283,12 +283,10 @@ func (s *Server) handleOne(client *unet.Socket) error {
// Client is dead.
return err
}
+ if s.afterRPCCallback != nil {
+ defer s.afterRPCCallback()
+ }
- defer func() {
- if s.afterRPCCallback != nil {
- s.afterRPCCallback()
- }
- }()
// Explicitly close all these files after the call.
//
// This is also explicitly a reference to the files after the call,