You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/04/13 04:33:52 UTC

[incubator-inlong] branch master updated: [INLONG-3650][Agent] Fix timeoffset npe (#3664)

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 5b245c78f [INLONG-3650][Agent] Fix timeoffset npe (#3664)
5b245c78f is described below

commit 5b245c78f5edd7dc84acb0cd1c52a050a748d5c5
Author: Schnapps <zp...@connect.ust.hk>
AuthorDate: Wed Apr 13 12:33:48 2022 +0800

    [INLONG-3650][Agent] Fix timeoffset npe (#3664)
---
 .../src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
index 19a5f9dd1..9c187f57a 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
@@ -101,9 +101,12 @@ public class JobProfileDto {
         FileJob.Dir dir = new FileJob.Dir();
         dir.setPattern(fileJobTaskConfig.getPattern());
         fileJob.setDir(dir);
-        fileJob.setTimeOffset(fileJobTaskConfig.getTimeOffset());
 
-        if (!fileJobTaskConfig.getAdditionalAttr().isEmpty()) {
+        if (fileJobTaskConfig.getTimeOffset() != null) {
+            fileJob.setTimeOffset(fileJobTaskConfig.getTimeOffset());
+        }
+
+        if (fileJobTaskConfig.getAdditionalAttr() != null) {
             fileJob.setAddictiveString(fileJobTaskConfig.getAdditionalAttr());
         }
         return fileJob;