[nifi] branch support/nifi-1.x updated: NIFI-3065 When copying a PG, do not set the Log File Suffix if not already set

[exceptionfactory]

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

exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 7b588fad17 NIFI-3065 When copying a PG, do not set the Log File Suffix 
if not already set
7b588fad17 is described below

commit 7b588fad17efb00e5208d548eade282ddd801cdf
Author: Mark Payne <marka...@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 <exceptionfact...@apache.org>
    (cherry picked from commit 0eebf6b14ea6bfe230cc675577edf166019f5ef7)
---
 .../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;
                     }