This is an automated email from the ASF dual-hosted git repository.
wenfeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-client-go.git
The following commit(s) were added to refs/heads/master by this push:
new f6cfc22 [ISSUE #757] Fix GetHeader type conflict (#758)
f6cfc22 is described below
commit f6cfc221547dae717929130e3b5d2ba56406e52f
Author: zhangyang <[email protected]>
AuthorDate: Wed Dec 22 15:52:14 2021 +0800
[ISSUE #757] Fix GetHeader type conflict (#758)
Signed-off-by: zhangyang <[email protected]>
---
internal/remote/remote_client.go | 4 ++--
primitive/pool.go | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/internal/remote/remote_client.go b/internal/remote/remote_client.go
index 5e2aa83..33b4633 100644
--- a/internal/remote/remote_client.go
+++ b/internal/remote/remote_client.go
@@ -155,13 +155,13 @@ func (c *remotingClient) receiveResponse(r
*tcpConnWrapper) {
break
}
- _, err = io.ReadFull(r, header)
+ _, err = io.ReadFull(r, *header)
if err != nil {
continue
}
var length int32
- err = binary.Read(bytes.NewReader(header), binary.BigEndian,
&length)
+ err = binary.Read(bytes.NewReader(*header), binary.BigEndian,
&length)
if err != nil {
continue
}
diff --git a/primitive/pool.go b/primitive/pool.go
index 03d4a17..29cd834 100644
--- a/primitive/pool.go
+++ b/primitive/pool.go
@@ -27,21 +27,22 @@ var bufferPool = sync.Pool{}
func init() {
headerPool.New = func() interface{} {
- return make([]byte, 4)
+ b := make([]byte, 4)
+ return &b
}
bufferPool.New = func() interface{} {
return new(bytes.Buffer)
}
}
-func GetHeader() []byte {
- d := headerPool.Get().([]byte)
+func GetHeader() *[]byte {
+ d := headerPool.Get().(*[]byte)
//d = (d)[:0]
return d
}
-func BackHeader(d []byte) {
- headerPool.Put(&d)
+func BackHeader(d *[]byte) {
+ headerPool.Put(d)
}
func GetBuffer() *bytes.Buffer {
