fix: do not close gocql.iter() on error (#302)

cadence-workflow · Aug 7, 2017 · aafd57d · aafd57d
1 parent e21f256
commit aafd57d
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/common/persistence/cassandraPersistence.go b/common/persistence/cassandraPersistence.go
@@ -713,7 +713,12 @@ func (d *cassandraPersistence) CreateWorkflowExecution(request *CreateWorkflowEx
 
 	previous := make(map[string]interface{})
 	applied, iter, err := d.session.MapExecuteBatchCAS(batch, previous)
-	defer iter.Close()
+	defer func() {
+		if iter != nil {
+			iter.Close()
+		}
+	}()
+
 	if err != nil {
 		if isTimeoutError(err) {
 			// Write may have succeeded, but we don't know
@@ -1019,7 +1024,12 @@ func (d *cassandraPersistence) UpdateWorkflowExecution(request *UpdateWorkflowEx
 
 	previous := make(map[string]interface{})
 	applied, iter, err := d.session.MapExecuteBatchCAS(batch, previous)
-	defer iter.Close()
+	defer func() {
+		if iter != nil {
+			iter.Close()
+		}
+	}()
+
 	if err != nil {
 		if isTimeoutError(err) {
 			// Write may have succeeded, but we don't know