Merge pull request #83 from shxsun/master
In go version 1.0.3 will call build error
Showing
1 changed file
with
1 additions
and
2 deletions
| ... | @@ -137,7 +137,7 @@ func GetInitListner(tcpaddr *net.TCPAddr) (l net.Listener, err error) { | ... | @@ -137,7 +137,7 @@ func GetInitListner(tcpaddr *net.TCPAddr) (l net.Listener, err error) { |
| 137 | countStr := os.Getenv(FDKey) | 137 | countStr := os.Getenv(FDKey) |
| 138 | if countStr == "" { | 138 | if countStr == "" { |
| 139 | return net.ListenTCP("tcp", tcpaddr) | 139 | return net.ListenTCP("tcp", tcpaddr) |
| 140 | } else { | 140 | } |
| 141 | count, err := strconv.Atoi(countStr) | 141 | count, err := strconv.Atoi(countStr) |
| 142 | if err != nil { | 142 | if err != nil { |
| 143 | return nil, err | 143 | return nil, err |
| ... | @@ -148,5 +148,4 @@ func GetInitListner(tcpaddr *net.TCPAddr) (l net.Listener, err error) { | ... | @@ -148,5 +148,4 @@ func GetInitListner(tcpaddr *net.TCPAddr) (l net.Listener, err error) { |
| 148 | return nil, err | 148 | return nil, err |
| 149 | } | 149 | } |
| 150 | return l, nil | 150 | return l, nil |
| 151 | } | ||
| 152 | } | 151 | } | ... | ... |
-
Please register or sign in to post a comment