cmailleux 2005/11/25 12:33:01 CET
Modified files:
core/src/java/org/jahia/services/importexport
ImportExportBaseService.java
Log:
Delete job in all case
Revision Changes Path
1.49 +2 -2
jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java.diff?r1=1.48&r2=1.49&f=h
Index: ImportExportBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ImportExportBaseService.java 23 Nov 2005 18:29:41 -0000 1.48
+++ ImportExportBaseService.java 25 Nov 2005 11:33:01 -0000 1.49
@@ -931,14 +931,14 @@
try {
JobDetail jobDetail;
if("yes".equalsIgnoreCase(siteSettings.getProperty(PRODUCTION_SYNCRONIZE_PROPERTY
+ targetSite))) {
-
schedulerServ.deleteJob(ProductionJob.JOB_NAME_PREFIX + site.getID() + "_" +
targetSite,
- ProductionJob.JOB_GROUP_NAME);
jobDetail = new
JobDetail(ProductionJob.JOB_NAME_PREFIX + site.getID() + "_" + targetSite,
ProductionJob.JOB_GROUP_NAME, ProductionJob.class);
} else {
jobDetail =
schedulerServ.getJobDetail(ProductionJob.JOB_NAME_PREFIX + site.getID() + "_" +
targetSite,
ProductionJob.JOB_GROUP_NAME);
}
+ schedulerServ.deleteJob(ProductionJob.JOB_NAME_PREFIX +
site.getID() + "_" + targetSite,
+ ProductionJob.JOB_GROUP_NAME);
jobDetail.setRequestsRecovery(true);
JobDataMap jobDataMap = jobDetail.getJobDataMap();
jobDataMap.put(ProductionJob.SITE_ID, site.getID());
