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 0c561336433 NIFI-15743 Added versions to log on failure to start with 
multiple Framework or Jetty NARs (#11036)
0c561336433 is described below

commit 0c5613364333422754430c47036d37bc7622b4a0
Author: Pierre Villard <[email protected]>
AuthorDate: Fri Mar 27 03:38:35 2026 +0100

    NIFI-15743 Added versions to log on failure to start with multiple 
Framework or Jetty NARs (#11036)
    
    Signed-off-by: David Handermann <[email protected]>
---
 .../src/main/java/org/apache/nifi/nar/NarUnpacker.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
 
b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
index 2399c295d63..9268bffe8b9 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
@@ -92,6 +92,8 @@ public final class NarUnpacker {
         try {
             File unpackedJetty = null;
             File unpackedFramework = null;
+            BundleCoordinate frameworkCoordinate = null;
+            BundleCoordinate jettyCoordinate = null;
             final Set<File> unpackedExtensions = new HashSet<>();
             final List<File> narFiles = new ArrayList<>();
 
@@ -139,17 +141,19 @@ public final class NarUnpacker {
                         // determine if this is the framework
                         if (frameworkNarId != null && 
frameworkNarId.equals(bundleCoordinate.getId())) {
                             if (unpackedFramework != null) {
-                                throw new IllegalStateException("Multiple 
framework NARs discovered. Only one framework is permitted.");
+                                throw new IllegalStateException("Multiple 
framework NARs discovered. Only one framework is permitted. Found [%s] and 
[%s]".formatted(
+                                        frameworkCoordinate, 
bundleCoordinate));
                             }
 
-                            // unpack the framework nar
+                            frameworkCoordinate = bundleCoordinate;
                             unpackedFramework = unpackNar(narFile, 
frameworkWorkingDir, verifyHash, unpackMode);
                         } else if 
(NarClassLoaders.JETTY_NAR_ID.equals(bundleCoordinate.getId())) {
                             if (unpackedJetty != null) {
-                                throw new IllegalStateException("Multiple 
Jetty NARs discovered. Only one Jetty NAR is permitted.");
+                                throw new IllegalStateException("Multiple 
Jetty NARs discovered. Only one Jetty NAR is permitted. Found [%s] and 
[%s]".formatted(
+                                        jettyCoordinate, bundleCoordinate));
                             }
 
-                            // unpack and record the Jetty nar
+                            jettyCoordinate = bundleCoordinate;
                             unpackedJetty = unpackNar(narFile, 
extensionsWorkingDir, verifyHash, unpackMode);
                             unpackedExtensions.add(unpackedJetty);
                         } else {

Reply via email to