You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2023/07/24 18:06:39 UTC
[nifi] branch main updated: NIFI-3065 When copying a PG, do not set the Log File Suffix if not already set
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 0eebf6b14e NIFI-3065 When copying a PG, do not set the Log File Suffix if not already set
0eebf6b14e is described below
commit 0eebf6b14ea6bfe230cc675577edf166019f5ef7
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Mon Jul 24 12:21:30 2023 -0400
NIFI-3065 When copying a PG, do not set the Log File Suffix if not already set
This closes #7522
Signed-off-by: David Handermann <ex...@apache.org>
---
.../src/main/java/org/apache/nifi/web/util/SnippetUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
index 9b183193d1..95b918e972 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
@@ -474,7 +474,7 @@ public final class SnippetUtils {
if (snippetContents.getProcessGroups() != null) {
for (final ProcessGroupDTO processGroupDTO : snippetContents.getProcessGroups()) {
String logFileSuffix = processGroupDTO.getLogFileSuffix();
- if (logFileSuffix != null) {
+ if (logFileSuffix != null && !logFileSuffix.trim().isEmpty()) {
while (existingLogFileSuffixes.contains(logFileSuffix)) {
logFileSuffix = "Copy_of_" + logFileSuffix;
}