Remove reload fix from main (#4369)

The fix from #4360 will not work for v2.10 branch features so removing from dev and working on a different PR.
nats-io · Aug 5, 2023 · 0e7394a · 0e7394a
2 parents c0c9633 + eecb8af
commit 0e7394a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/server/reload_test.go b/server/reload_test.go
@@ -2509,6 +2509,7 @@ func TestConfigReloadClusterPermsOldServer(t *testing.T) {
 }
 
 func TestConfigReloadAccountUsers(t *testing.T) {
+	t.Skip("fix for this needs to be revisited for v2.10 release")
 	conf := createConfFile(t, []byte(`
 	listen: "127.0.0.1:-1"
 	accounts {
@@ -2726,6 +2727,7 @@ func TestConfigReloadAccountUsers(t *testing.T) {
 }
 
 func TestConfigReloadAccountWithNoChanges(t *testing.T) {
+	t.Skip("fix for this needs to be revisited for v2.10 release")
 	conf := createConfFile(t, []byte(`
 	listen: "127.0.0.1:-1"
         system_account: sys

diff --git a/server/server.go b/server/server.go
@@ -1202,9 +1202,6 @@ func (s *Server) configureAccounts(reloading bool) (map[string]struct{}, error)
 			c.processUnsub(sid)
 		}
 		acc.addAllServiceImportSubs()
-		s.mu.Unlock()
-		s.registerSystemImports(acc)
-		s.mu.Lock()
 	}
 
 	// Set the system account if it was configured.