fix:maxCallAttempts default values

xinfan.wu(吴歆帆) · xinfan.wu(吴歆帆) · commit 0fa5e9e0db8e · 2024-07-04T20:51:25.000+08:00
diff --git a/clientconn.go b/clientconn.go
@@ -173,6 +173,9 @@ func NewClient(target string, opts ...DialOption) (conn *ClientConn, err error)
 	}
 
 	if cc.dopts.defaultServiceConfigRawJSON != nil {
+		if cc.dopts.maxCallAttempts == 0 {
+			cc.dopts.maxCallAttempts = defaultMaxCallAttempts
+		}
 		scpr := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON, cc.dopts.maxCallAttempts)
 		if scpr.Err != nil {
 			return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, scpr.Err)

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,9 @@ func NewClient(target string, opts ...DialOption) (conn *ClientConn, err error)`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`if cc.dopts.defaultServiceConfigRawJSON != nil {`
	`176`	`+ if cc.dopts.maxCallAttempts == 0 {`
	`177`	`+ cc.dopts.maxCallAttempts = defaultMaxCallAttempts`
	`178`	`+ }`
`176`	`179`	`scpr := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON, cc.dopts.maxCallAttempts)`
`177`	`180`	`if scpr.Err != nil {`
`178`	`181`	`return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, scpr.Err)`