Merge branch 'master' into v-yiqcao/nullCheck

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -41,16 +41,16 @@ export class NotebookContainerClient {
   }
 
   private async getMemoryUsage(): Promise<DataModels.MemoryUsageInfo> {
+    if (this.isResettingWorkspace) {
+      return undefined;
+    }
+    
     if (!this.notebookServerInfo() || !this.notebookServerInfo().notebookServerEndpoint) {
       const error = "No server endpoint detected";
       Logger.logError(error, "NotebookContainerClient/getMemoryUsage");
       return Promise.reject(error);
     }
 
-    if (this.isResettingWorkspace) {
-      return undefined;
-    }
-
     const { notebookServerEndpoint, authToken } = this.getNotebookServerConfig();
     try {
       const response = await fetch(`${notebookServerEndpoint}/api/metrics/memory`, {