You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2022/03/16 03:08:06 UTC
[dolphinscheduler] branch dev updated: blank path should not be read (#8883)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new b1f7f78 blank path should not be read (#8883)
b1f7f78 is described below
commit b1f7f788fda60d1f50bc4a398ede5c2b31246884
Author: gaojun2048 <ga...@gmail.com>
AuthorDate: Wed Mar 16 11:07:59 2022 +0800
blank path should not be read (#8883)
---
.../dolphinscheduler/server/log/LoggerRequestProcessor.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java b/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
index 46e6e48..afc914e 100644
--- a/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
+++ b/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
@@ -151,11 +151,12 @@ public class LoggerRequestProcessor implements NettyRequestProcessor {
if (StringUtils.isBlank(dsHome)) {
dsHome = System.getProperty("user.dir");
}
- if (path.startsWith(dsHome) && !path.contains("../") && path.endsWith(".log")) {
- return true;
+ if (StringUtils.isBlank(path)) {
+ logger.warn("path is null");
+ return false;
+ } else {
+ return path.startsWith(dsHome) && !path.contains("../") && path.endsWith(".log");
}
-
- return false;
}
public ExecutorService getExecutor() {