Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1474: fix registration error if job name is not the same as bean name

Browse Source
This commit is contained in:
dsyer
2010-01-04 17:47:29 +00:00
parent 52bc1f2347
commit 81d96cd63a
2 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java
View File

@@ -134,24 +134,30 @@ public class DefaultJobLoader implements JobLoader {
contexts.put(factory, context);
String[] names = context.getBeanNamesForType(Job.class);
Collection<Job> result = new ArrayList<Job>();
for (String name : names) {
if (!autoRegistrationDetected) {
Job job = (Job) context.getBean(name);
String jobName = job.getName();
// On reload try to unregister first
if (unregister) {
logger.debug("Unregistering job: " + name + " from context: " + context.getDisplayName());
jobRegistry.unregister(name);
logger.debug("Unregistering job: " + jobName + " from context: " + context.getDisplayName());
jobRegistry.unregister(jobName);
}
logger.debug("Registering job: " + name + " from context: " + context.getDisplayName());
JobFactory jobFactory = new ReferenceJobFactory((Job) context.getBean(name));
logger.debug("Registering job: " + jobName + " from context: " + context.getDisplayName());
JobFactory jobFactory = new ReferenceJobFactory(job);
jobRegistry.register(jobFactory);
jobsRegistered.add(name);
jobsRegistered.add(jobName);
}
}
Collection<Job> result = new ArrayList<Job>();
for (String name : jobsRegistered) {
try {
result.add(jobRegistry.getJob(name));
}