Merge branch 'hotfix/dont-clear-opstatus' into 'release'

Hotfix/ dont clear optatus and rekeychan

See merge request !343

api/client.go

@@ -218,8 +218,6 @@ func (cl *Client) Logout(timeoutDuration time.Duration) error {
 	cl.session = nil
 	cl.receptionManager = nil
 	cl.topology = nil
-	cl.opStatus = nil
-	cl.rekeyChan = nil
 	cl.registrationVersion = ""
 
 	return nil

api/client_test.go

@@ -616,14 +616,7 @@ func TestClient_LogoutHappyPath(t *testing.T) {
 		t.Logf("Topology should be set to nil on shutdown")
 		t.Fail()
 	}
-	if tc.opStatus != nil {
-		t.Logf("OPstatus should be set to nil on shutdown")
-		t.Fail()
-	}
-	if tc.rekeyChan != nil {
-		t.Logf("rekeyChan should be set to nil on shutdown")
-		t.Fail()
-	}
+
 
 	//Test that the things that should not be nil are not nil
 	if tc.ndf == nil {
@@ -634,6 +627,14 @@ func TestClient_LogoutHappyPath(t *testing.T) {
 		t.Logf("Storage should not be set to nil")
 		t.Fail()
 	}
+	if tc.opStatus == nil {
+		t.Logf("OPstatus should not be set to nil on shutdown")
+		t.Fail()
+	}
+	if tc.rekeyChan == nil {
+		t.Logf("rekeyChan should not be set to nil on shutdown")
+		t.Fail()
+	}
 }
 
 //Test that the client shutdown will timeout when it fails to shutdown