Do not defer in loop

Peter Wilhelmsson · 2hdddg · commit 7afc68f07724 · 2020-09-16T09:00:20.000+02:00
Defers will potentially grow too much.
diff --git a/neo4j/internal/router/readtable.go b/neo4j/internal/router/readtable.go
@@ -45,17 +45,18 @@ func readTable(ctx context.Context, pool Pool, database string, routers []string
 			err = wrapInReadRoutingTableError(router, err)
 			continue
 		}
-		defer pool.Return(conn)
 
 		discovery, ok := conn.(db.ClusterDiscovery)
 		if !ok {
 			err = &db.RoutingNotSupportedError{Server: conn.ServerName()}
 			err = wrapInReadRoutingTableError(router, err)
+			pool.Return(conn)
 			continue
 		}
 
 		var table *db.RoutingTable
 		table, err = discovery.GetRoutingTable(database, routerContext)
+		pool.Return(conn)
 		if err == nil {
 			return table, nil
 		}

Original file line number	Diff line number	Diff line change
`@@ -45,17 +45,18 @@ func readTable(ctx context.Context, pool Pool, database string, routers []string`
`45`	`45`	`err = wrapInReadRoutingTableError(router, err)`
`46`	`46`	`continue`
`47`	`47`	`}`
`48`		`- defer pool.Return(conn)`
`49`	`48`
`50`	`49`	`discovery, ok := conn.(db.ClusterDiscovery)`
`51`	`50`	`if !ok {`
`52`	`51`	`err = &db.RoutingNotSupportedError{Server: conn.ServerName()}`
`53`	`52`	`err = wrapInReadRoutingTableError(router, err)`
	`53`	`+ pool.Return(conn)`
`54`	`54`	`continue`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`var table *db.RoutingTable`
`58`	`58`	`table, err = discovery.GetRoutingTable(database, routerContext)`
	`59`	`+ pool.Return(conn)`
`59`	`60`	`if err == nil {`
`60`	`61`	`return table, nil`
`61`	`62`	`}`