From ae9712c76688a07e1149958994a9ab3e5a99c37f Mon Sep 17 00:00:00 2001
From: Daniel Theophanes <kardianos@gmail.com>
Date: Thu, 1 Dec 2016 11:07:11 -0800
Subject: database/sql: ensure Commit and Rollback return ErrTxDone

Ensure documented behavior of returning ErrTxDone if the Tx has
already been committed or rolled back.

Fixes #18147

Change-Id: I07dc75bef4dbd4dd88dd252c96dc8ab99f28c00e
Reviewed-on: https://go-review.googlesource.com/33793
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
---
 src/database/sql/sql.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/database/sql/sql.go')

diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index e11a9dadd0..3d957e1450 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -1449,14 +1449,14 @@ func (tx *Tx) closePrepared() {
 
 // Commit commits the transaction.
 func (tx *Tx) Commit() error {
+	if tx.isDone() {
+		return ErrTxDone
+	}
 	select {
 	default:
 	case <-tx.ctx.Done():
 		return tx.ctx.Err()
 	}
-	if tx.isDone() {
-		return ErrTxDone
-	}
 	var err error
 	withLock(tx.dc, func() {
 		err = tx.txi.Commit()
-- 
cgit v1.3