Fix half close

Author: plorenz

ziti/edge/network/conn.go

@@ -108,11 +108,12 @@ func (conn *edgeConn) CloseWrite() error {
 		headers := channel.Headers{}
 		headers.PutUint32Header(edge.FlagsHeader, edge.FIN)
 		_, err := conn.WriteTraced(nil, nil, headers)
-		return err
-	}
 
-	if conn.xgCircuit != nil {
-		conn.xgCircuit.xg.CloseRxTimeout()
+		if conn.xgCircuit != nil {
+			conn.xgCircuit.xg.CloseRxTimeout()
+		}
+
+		return err
 	}
 
 	return nil

ziti/edge/network/conn_test.go

@@ -185,6 +185,10 @@ func TestReadMultipart(t *testing.T) {
 type NoopTestChannel struct {
 }
 
+func (ch *NoopTestChannel) CloseNotify() <-chan struct{} {
+	panic("implement me")
+}
+
 func (ch *NoopTestChannel) GetUnderlays() []channel.Underlay {
 	panic("implement me")
 }