fix: popConfig interceptor.after finally (#322)

megaease · Jan 24, 2024 · c6db50f · c6db50f
1 parent ea8b57e
commit c6db50f
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.../main/java/com/megaease/easeagent/core/plugin/interceptor/InterceptorPluginDecorator.java b/.../main/java/com/megaease/easeagent/core/plugin/interceptor/InterceptorPluginDecorator.java
@@ -64,16 +64,18 @@ public void before(MethodInfo methodInfo, Context context) {
     public void after(MethodInfo methodInfo, Context context) {
         IPluginConfig cfg = context.getConfig();
         InitializeContext innerContext = (InitializeContext) context;
-
-        if (cfg == null || cfg.enabled() || cfg instanceof NoOpIPluginConfig) {
-            try {
-                this.interceptor.after(methodInfo, context);
-            } finally {
-                innerContext.popToBound();
-                innerContext.popRetBound();
+        try {
+            if (cfg == null || cfg.enabled() || cfg instanceof NoOpIPluginConfig) {
+                try {
+                    this.interceptor.after(methodInfo, context);
+                } finally {
+                    innerContext.popToBound();
+                    innerContext.popRetBound();
+                }
             }
+        } finally {
+            innerContext.popConfig();
         }
-        innerContext.popConfig();
     }
 
     @Override