From c4b3e42bb61681da5d37ad895f53ad41428c1206 Mon Sep 17 00:00:00 2001 From: James Perkins Date: Wed, 24 Aug 2016 16:42:58 -0700 Subject: [PATCH] [WFLY-7000] Attempt to load services for all deployments regardless of the existence of the batch-jobs directory in a deployment. --- .../jberet/deployment/WildFlyJobXmlResolver.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/batch/extension-jberet/src/main/java/org/wildfly/extension/batch/jberet/deployment/WildFlyJobXmlResolver.java b/batch/extension-jberet/src/main/java/org/wildfly/extension/batch/jberet/deployment/WildFlyJobXmlResolver.java index 3430f4751c9e..6102c5fed9c3 100644 --- a/batch/extension-jberet/src/main/java/org/wildfly/extension/batch/jberet/deployment/WildFlyJobXmlResolver.java +++ b/batch/extension-jberet/src/main/java/org/wildfly/extension/batch/jberet/deployment/WildFlyJobXmlResolver.java @@ -66,13 +66,6 @@ public class WildFlyJobXmlResolver implements JobXmlResolver { private final Map jobXmlFiles; private final ClassLoader classLoader; - private WildFlyJobXmlResolver() { - classLoader = null; - resolvedJobs = Collections.emptyMap(); - jobXmlResolvers = Collections.emptySet(); - jobXmlFiles = Collections.emptyMap(); - } - private WildFlyJobXmlResolver(final ClassLoader classLoader, final Map jobXmlFiles) { this.classLoader = classLoader; resolvedJobs = new LinkedHashMap<>(); @@ -95,17 +88,17 @@ public static WildFlyJobXmlResolver of(final ClassLoader classLoader, final Depl // We may have some job XML files final Map xmlFiles = jobsDir.getChildren(JobXmlFilter.INSTANCE) .stream() - .collect(Collectors.toMap(VirtualFile::getName, (f) -> f)); + .collect(Collectors.toMap(VirtualFile::getName, (f) -> f)); jobXmlResolver = new WildFlyJobXmlResolver(classLoader, xmlFiles); - // Initialize this instance - jobXmlResolver.init(); } catch (IOException e) { throw BatchLogger.LOGGER.errorProcessingBatchJobsDir(e); } } else { // This is likely not a batch deployment, creates a no-op service - jobXmlResolver = new WildFlyJobXmlResolver(); + jobXmlResolver = new WildFlyJobXmlResolver(classLoader, Collections.emptyMap()); } + // Initialize this instance + jobXmlResolver.init(); deploymentUnit.putAttachment(JOB_XML_RESOLVER, jobXmlResolver); return jobXmlResolver; }