Merge pull request #98 from leslie-qiwa/master

socket should be closed when socket error happened during abort

Author: pin

receiver.go

@@ -258,6 +258,12 @@ func (r *receiver) abort(err error) error {
 	if r.conn == nil {
 		return nil
 	}
+
+	defer func() {
+		r.conn.close()
+		r.conn = nil
+	}()
+
 	if r.hook != nil {
 		r.hook.OnFailure(r.buildTransferStats(), err)
 	}
@@ -266,7 +272,5 @@ func (r *receiver) abort(err error) error {
 	if err != nil {
 		return err
 	}
-	r.conn.close()
-	r.conn = nil
 	return nil
 }

sender.go

@@ -278,6 +278,12 @@ func (s *sender) abort(err error) error {
 	if s.conn == nil {
 		return nil
 	}
+
+	defer func() {
+		s.conn.close()
+		s.conn = nil
+	}()
+
 	if s.hook != nil {
 		s.hook.OnFailure(s.buildTransferStats(), err)
 	}
@@ -286,7 +292,5 @@ func (s *sender) abort(err error) error {
 	if err != nil {
 		return err
 	}
-	s.conn.close()
-	s.conn = nil
 	return nil
 }