This is an automated email from the ASF dual-hosted git repository.
rahulvats pushed a commit to branch v3-2-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v3-2-test by this push:
new 531196158fc [v3-2-test] Guard against null trigger in asset watcher
cleanup (#64659) (#64660)
531196158fc is described below
commit 531196158fcb6ac9456d2c6ba004ef93822a31f9
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 3 13:37:38 2026 +0530
[v3-2-test] Guard against null trigger in asset watcher cleanup (#64659)
(#64660)
(cherry picked from commit 1ec9d8aee060ca9effd1facea241c80cf96dc6b1)
Co-authored-by: Rahul Vats <[email protected]>
---
airflow-core/src/airflow/dag_processing/collection.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/airflow-core/src/airflow/dag_processing/collection.py
b/airflow-core/src/airflow/dag_processing/collection.py
index 1d60c32020f..96f3c89f862 100644
--- a/airflow-core/src/airflow/dag_processing/collection.py
+++ b/airflow-core/src/airflow/dag_processing/collection.py
@@ -1101,7 +1101,8 @@ class AssetModelOperation(NamedTuple):
asset_model.watchers = [
watcher
for watcher in asset_model.watchers
- if BaseEventTrigger.hash(watcher.trigger.classpath,
watcher.trigger.kwargs)
+ if watcher.trigger is not None
+ and BaseEventTrigger.hash(watcher.trigger.classpath,
watcher.trigger.kwargs)
not in trigger_hashes
]
