fix: fix a deadlock issue when it occurs simultaneously: a goroutine …

…is trying to lock, and another goroutine waits since full of channel buffers #440
go-ldap · Jul 19, 2023 · 741471d · 741471d
1 parent 7778a1c
commit 741471d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/conn.go b/conn.go
@@ -327,8 +327,6 @@ func (l *Conn) nextMessageID() int64 {
 // GetLastError returns the last recorded error from goroutines like processMessages and reader.
 // Only the last recorded error will be returned.
 func (l *Conn) GetLastError() error {
-	l.messageMutex.Lock()
-	defer l.messageMutex.Unlock()
 	return l.err
 }
 

diff --git a/response.go b/response.go
@@ -60,10 +60,6 @@ func (r *searchResponse) Next() bool {
 	if r.err != nil {
 		return false
 	}
-	r.err = r.conn.GetLastError()
-	if r.err != nil {
-		return false
-	}
 	r.entry = res.Entry
 	r.referral = res.Referral
 	r.controls = res.Controls

diff --git a/v3/conn.go b/v3/conn.go
@@ -327,8 +327,6 @@ func (l *Conn) nextMessageID() int64 {
 // GetLastError returns the last recorded error from goroutines like processMessages and reader.
 // // Only the last recorded error will be returned.
 func (l *Conn) GetLastError() error {
-	l.messageMutex.Lock()
-	defer l.messageMutex.Unlock()
 	return l.err
 }
 

diff --git a/v3/response.go b/v3/response.go
@@ -60,10 +60,6 @@ func (r *searchResponse) Next() bool {
 	if r.err != nil {
 		return false
 	}
-	r.err = r.conn.GetLastError()
-	if r.err != nil {
-		return false
-	}
 	r.entry = res.Entry
 	r.referral = res.Referral
 	r.controls = res.Controls