From a3eb8128d4efa2e84e5ac8bc76ae011cd90ef717 Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Fri, 27 Sep 2024 10:40:46 -0400 Subject: [PATCH 1/3] [WFLY-19793] App client container should log java.lang.NoClassDefFoundError failures and other failures while loading the appclient main class Signed-off-by: Scott Marlow --- .../deployment/ApplicationClientManifestProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java index c8ce34319507..bef2582764a0 100644 --- a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java +++ b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java @@ -56,7 +56,7 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU if (environment != null) { DescriptorEnvironmentLifecycleMethodProcessor.handleMethods(environment, moduleDescription, mainClass); } - } catch (ClassNotFoundException e) { + } catch (Throwable e) { throw AppClientLogger.ROOT_LOGGER.cannotLoadAppClientMainClass(e); } @@ -64,4 +64,4 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU } } } -} + From 91a14754c2d0b080fca1e624d26954c76c931b3e Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Fri, 27 Sep 2024 12:07:52 -0400 Subject: [PATCH 2/3] [WFLY-19793] only log the cannotLoadAppClientMainClass error for problems during the load client main class operation. Signed-off-by: Scott Marlow --- .../ApplicationClientManifestProcessor.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java index bef2582764a0..18516849a63e 100644 --- a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java +++ b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java @@ -45,21 +45,21 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU if (main != null) { String mainClass = main.getValue("Main-Class"); if (mainClass != null && !mainClass.isEmpty()) { + final Class clazz; try { - final Class clazz = module.getClassLoader().loadClass(mainClass); - deploymentUnit.putAttachment(AppClientAttachments.MAIN_CLASS, clazz); - final ApplicationClientComponentDescription description = new ApplicationClientComponentDescription(clazz.getName(), moduleDescription, deploymentUnit.getServiceName()); - moduleDescription.addComponent(description); - deploymentUnit.putAttachment(AppClientAttachments.APPLICATION_CLIENT_COMPONENT, description); - - final DeploymentDescriptorEnvironment environment = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.MODULE_DEPLOYMENT_DESCRIPTOR_ENVIRONMENT); - if (environment != null) { - DescriptorEnvironmentLifecycleMethodProcessor.handleMethods(environment, moduleDescription, mainClass); - } + clazz = module.getClassLoader().loadClass(mainClass); } catch (Throwable e) { throw AppClientLogger.ROOT_LOGGER.cannotLoadAppClientMainClass(e); } + deploymentUnit.putAttachment(AppClientAttachments.MAIN_CLASS, clazz); + final ApplicationClientComponentDescription description = new ApplicationClientComponentDescription(clazz.getName(), moduleDescription, deploymentUnit.getServiceName()); + moduleDescription.addComponent(description); + deploymentUnit.putAttachment(AppClientAttachments.APPLICATION_CLIENT_COMPONENT, description); + final DeploymentDescriptorEnvironment environment = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.MODULE_DEPLOYMENT_DESCRIPTOR_ENVIRONMENT); + if (environment != null) { + DescriptorEnvironmentLifecycleMethodProcessor.handleMethods(environment, moduleDescription, mainClass); + } } } } From 55dfef1b1e627a4b9d3c9689a021604044501252 Mon Sep 17 00:00:00 2001 From: Brian Stansberry Date: Sun, 29 Sep 2024 14:17:59 -0500 Subject: [PATCH 3/3] [WFLY-19793] Add missing brace to ApplicationClientManifestProcessor.java --- .../appclient/deployment/ApplicationClientManifestProcessor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java index 18516849a63e..3d3b7eb20530 100644 --- a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java +++ b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientManifestProcessor.java @@ -64,4 +64,5 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU } } } +}