[dubbo] branch 3.0 updated: Revert FrameworkModel notify destroy order (#8874)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 4293bae  Revert FrameworkModel notify destroy order (#8874)
4293bae is described below

commit 4293bae08d6f791c98049ff78bfcf4dad243dcb4
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Wed Sep 22 16:09:37 2021 +0800

    Revert FrameworkModel notify destroy order (#8874)
---
 .../src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java
index 3731527..6ed1917 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java
@@ -76,14 +76,14 @@ public class FrameworkModel extends ScopeModel {
             applicationModel.destroy();
         }
 
-        notifyDestroy();
-
         allInstances.remove(this);
         if (defaultInstance == this) {
             synchronized (FrameworkModel.class) {
                 defaultInstance = null;
             }
         }
+
+        notifyDestroy();
     }
 
     public static FrameworkModel defaultModel() {