NullPointerException in TaskManagementService.getTaskData in case tas…

…k is not found
transferwise · Nov 16, 2023 · b4fe6b2 · b4fe6b2
1 parent c931098
commit b4fe6b2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.40.6 - 2023/11/16
+### Fixed
+
+* NullPointerException in TaskManagementService.getTaskData in case task is not found
+
 #### 1.40.5 - 2023/10/30
 ### Added
 - Setting METADATA_MAX_AGE_CONFIG to two minutes for producer

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version=1.40.5
+version=1.40.6
 org.gradle.internal.http.socketTimeout=120000
diff --git a/...ks-management/src/main/java/com/transferwise/tasks/management/TasksManagementService.java b/...ks-management/src/main/java/com/transferwise/tasks/management/TasksManagementService.java
@@ -236,10 +236,10 @@ public GetTaskDataResponse getTaskData(GetTaskDataRequest request) {
           GetTaskDataResponse response = new GetTaskDataResponse();
 
           final FullTaskRecord task = taskDao.getTask(taskId, FullTaskRecord.class);
-          mdcService.put(task);
           if (task == null) {
             response.setResultCode(ResultCode.NOT_FOUND);
           } else {
+            mdcService.put(task);
             response.setVersion(task.getVersion());
             response.setType(task.getType());