Skip to content

Commit 873521b

Browse files
committed
fix null bug
1 parent 87c449a commit 873521b

File tree

6 files changed

+19
-17
lines changed

6 files changed

+19
-17
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.codingapi.springboot</groupId>
1414
<artifactId>springboot-parent</artifactId>
15-
<version>2.1.3</version>
15+
<version>2.1.4</version>
1616

1717
<url>https://github.com/codingapi/springboot-framewrok</url>
1818
<name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>2.1.3</version>
8+
<version>2.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

springboot-starter-id-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>2.1.3</version>
8+
<version>2.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

springboot-starter-security-jwt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security-jwt</artifactId>

springboot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>2.1.3</version>
8+
<version>2.1.4</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

springboot-starter/src/main/java/com/codingapi/springboot/framework/trigger/TriggerContext.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,21 @@ private Class<? extends Trigger> getTriggerClass(Class<?> handler){
7171
public void trigger(Trigger trigger){
7272
Class<? extends Trigger> clazz = trigger.getClass();
7373
List<TriggerHandler> triggerHandlerList = triggers.get(clazz);
74-
for(TriggerHandler handler:triggerHandlerList){
75-
Class<? extends Trigger> triggerClass = getTriggerClass(handler.getClass());
76-
if(triggerClass.equals(clazz)) {
77-
try {
78-
boolean canTrigger = handler.preTrigger(trigger);
79-
if (canTrigger) {
80-
handler.trigger(trigger);
74+
if(triggerHandlerList!=null) {
75+
for (TriggerHandler handler : triggerHandlerList) {
76+
Class<? extends Trigger> triggerClass = getTriggerClass(handler.getClass());
77+
if (triggerClass.equals(clazz)) {
78+
try {
79+
boolean canTrigger = handler.preTrigger(trigger);
80+
if (canTrigger) {
81+
handler.trigger(trigger);
82+
}
83+
if (handler.remove(trigger, canTrigger)) {
84+
triggerHandlerList.remove(handler);
85+
}
86+
} catch (Exception e) {
87+
log.warn("trigger error", e);
8188
}
82-
if (handler.remove(trigger,canTrigger)) {
83-
triggerHandlerList.remove(handler);
84-
}
85-
}catch (Exception e){
86-
log.warn("trigger error",e);
8789
}
8890
}
8991
}

0 commit comments

Comments
 (0)