ApplicationContextHolder 适配非 Spring 环境.

3 years ago · 69973a8554
parent 24b7b2b0aa
commit 69973a8554
2 changed files with 2 additions and 6 deletions
--- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
+++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
@ -91,7 +91,7 @@ public class DynamicThreadPoolExecutor extends AbstractDynamicExecutorSupport {
            long endTime = System.currentTimeMillis();
            long executeTime;
            boolean executeTimeAlarm = (executeTime = (endTime - startTime)) > executeTimeOut;
-            if (executeTimeAlarm) {
+            if (executeTimeAlarm && ApplicationContextHolder.getInstance() != null) {
                ThreadPoolNotifyAlarmHandler notifyAlarmHandler = ApplicationContextHolder.getBean(ThreadPoolNotifyAlarmHandler.class);
                if (notifyAlarmHandler != null) {
                    notifyAlarmHandler.asyncSendExecuteTimeOutAlarm(threadPoolId, executeTime, executeTimeOut, this);
--- a/hippo4j-core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
+++ b/hippo4j-core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
@ -30,11 +30,7 @@ public class RejectedProxyInvocationHandler implements InvocationHandler {

        if (ApplicationContextHolder.getInstance() != null) {
            ThreadPoolNotifyAlarmHandler alarmHandler = ApplicationContextHolder.getBean(ThreadPoolNotifyAlarmHandler.class);
-            try {
-                alarmHandler.checkPoolRejectedAlarm(threadPoolId);
-            } catch (Exception ignored) {
-                //ignored
-            }
+            alarmHandler.checkPoolRejectedAlarm(threadPoolId);
        }

        try {