]> Cypherpunks repositories - gostls13.git/commitdiff
database/sql: fix ctx.Done() == nil check
authorRuss Cox <rsc@golang.org>
Wed, 15 Nov 2017 20:14:07 +0000 (15:14 -0500)
committerRuss Cox <rsc@golang.org>
Wed, 15 Nov 2017 21:28:27 +0000 (21:28 +0000)
ctx.Done() == ctx.Background().Done() is just
a long way to write ctx.Done() == nil.
Use the short way.

Change-Id: I7b3198b5dc46b8b40086243aa61882bc8c268eac
Reviewed-on: https://go-review.googlesource.com/78128
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/database/sql/ctxutil.go

index 170ec7d8a021171d65c0ad439078ab4eb4dcdbab..af2afd5aa5704326d4799f53c33deb9faf003ebb 100644 (file)
@@ -120,7 +120,7 @@ func ctxDriverBegin(ctx context.Context, opts *TxOptions, ci driver.Conn) (drive
                }
        }
 
-       if ctx.Done() == context.Background().Done() {
+       if ctx.Done() == nil {
                return ci.Begin()
        }