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

jinsongzhou pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/0.7.x by this push:
     new 7b2f6be29 [AMORO-3242] Fix optimizer keeper unregister npe (#3243)
7b2f6be29 is described below

commit 7b2f6be29cf03cfbccb43babc3475af848e45954
Author: majin1102 <[email protected]>
AuthorDate: Sat Oct 12 11:47:01 2024 +0800

    [AMORO-3242] Fix optimizer keeper unregister npe (#3243)
    
    Fix optimizer keeper unregister npe
    
    Co-authored-by: majin.nathan <[email protected]>
    (cherry picked from commit 3e17628b8ab304aae52d605e4610b6156a1ec007)
    Signed-off-by: zhoujinsong <[email protected]>
---
 .../main/java/org/apache/amoro/server/DefaultOptimizingService.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
 
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
index 91fde213c..f4c26b1be 100644
--- 
a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
+++ 
b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
@@ -165,7 +165,9 @@ public class DefaultOptimizingService extends 
StatedPersistentBase
     doAs(OptimizerMapper.class, mapper -> mapper.deleteOptimizer(token));
     OptimizingQueue optimizingQueue = optimizingQueueByToken.remove(token);
     OptimizerInstance optimizer = authOptimizers.remove(token);
-    optimizingQueue.removeOptimizer(optimizer);
+    if (optimizingQueue != null) {
+      optimizingQueue.removeOptimizer(optimizer);
+    }
   }
 
   @Override

Reply via email to