Merge pull request #154 from jumpserver/dev_bugfix

[bugfix] fix lock bugs

Merge pull request #154 from jumpserver/dev_bugfix
[bugfix] fix lock bugs
42917447 · Eric_Lee · GitHub · 226a91fa · cc53d77e · 42917447
Unverified Commit 42917447 authored Nov 15, 2019 by Eric_Lee Committed by GitHub Nov 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

wrappersession.go pkg/handler/wrappersession.go +2 -3

No files found.
--- a/pkg/handler/wrappersession.go
+++ b/pkg/handler/wrappersession.go
@@ -66,9 +66,6 @@ func (w *WrapperSession) Close() error {
 		return nil
 	default:
 	}
-	w.mux.Lock()
-	defer w.mux.Unlock()
-	_ = w.outReader.Close()
 	err := w.inWriter.Close()
 	w.initReadPip()
 	return err
@@ -79,6 +76,8 @@ func (w *WrapperSession) Write(p []byte) (int, error) {
 }

 func (w *WrapperSession) initReadPip() {
+	w.mux.Lock()
+	defer w.mux.Unlock()
 	w.outReader, w.inWriter = io.Pipe()
 }