From 996a36b0c7f4dcd1fa423fd458b7e36c179ade85 Mon Sep 17 00:00:00 2001 From: cashlalala Date: Thu, 6 Sep 2018 09:56:30 +0800 Subject: [PATCH 1/3] skip updating the dynamic configuration if jobs are disabled --- .../gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java index 5b093728b..7cc0290a1 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java @@ -63,6 +63,9 @@ public void run() { if (StringUtils.isEmpty(trigger.getTriggerConfigURL())) { return; } + if (!trigger.getJob().isBuildable()) { + return; + } trigger.updateTriggerConfigURL(); } From 0c20751971e54ae99cbe0b54253fb7873e830d9e Mon Sep 17 00:00:00 2001 From: cashlalala Date: Tue, 11 Sep 2018 00:31:44 +0800 Subject: [PATCH 2/3] check if job object is null before use it --- .../gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java index 7cc0290a1..7e241e51b 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java @@ -63,7 +63,7 @@ public void run() { if (StringUtils.isEmpty(trigger.getTriggerConfigURL())) { return; } - if (!trigger.getJob().isBuildable()) { + if (trigger.getJob() != null && !trigger.getJob().isBuildable()) { return; } trigger.updateTriggerConfigURL(); From beb95f8a1b04ce7e0a804cb84d0cd10d869d8965 Mon Sep 17 00:00:00 2001 From: cashlalala Date: Tue, 11 Sep 2018 00:53:30 +0800 Subject: [PATCH 3/3] fix the check style failure --- .../gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java index 7e241e51b..7a967291d 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java @@ -64,7 +64,7 @@ public void run() { return; } if (trigger.getJob() != null && !trigger.getJob().isBuildable()) { - return; + return; } trigger.updateTriggerConfigURL(); }