modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ShowInstalledPackageHistoryUIBean.java | 3 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedSchedulerImpl.java | 17 +++++++--- 2 files changed, 16 insertions(+), 4 deletions(-)
New commits: commit 8593598f69e6bca1a886818b3ec0b4f41da59277 Merge: 22ce633... 85c35b5... Author: Ian P. Springer <ips@jetengine.(none)> Date: Thu Apr 1 17:58:16 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 22ce63359bb5856a1e51bad5c4923113d9ebc9a9 Author: Ian P. Springer <ips@jetengine.(none)> Date: Thu Apr 1 17:57:43 2010 -0400
add a4j keep-alive annotation to UIBean will survive across AJAX requests
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ShowInstalledPackageHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ShowInstalledPackageHistoryUIBean.java index 075d273..668d980 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ShowInstalledPackageHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ShowInstalledPackageHistoryUIBean.java @@ -23,6 +23,8 @@ import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; import javax.faces.component.UIData; import javax.faces.model.SelectItem; + +import org.ajax4jsf.model.KeepAlive; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.content.InstalledPackageHistory; @@ -37,6 +39,7 @@ import org.rhq.enterprise.server.content.ContentUIManagerLocal; * * @author Jason Dobies */ +@KeepAlive public class ShowInstalledPackageHistoryUIBean {
private InstalledPackageHistory history;
commit 13277b3af1bf163ac712260821c4d3db189e52a1 Author: Ian P. Springer <ips@jetengine.(none)> Date: Thu Apr 1 17:57:00 2010 -0400
add better error handling when calling deleteJob() on Quartz scheduler returns false
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedSchedulerImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedSchedulerImpl.java index 23a8381..b3c213a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedSchedulerImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedSchedulerImpl.java @@ -63,12 +63,17 @@ public class EnhancedSchedulerImpl implements EnhancedScheduler { try { // see if the job is already scheduled and if so, // either remove it so we can reschedule it or keep it (based on rescheduleIfExists) - if (this.scheduler.getJobDetail(name, groupName) != null) { + JobDetail job = this.scheduler.getJobDetail(name, groupName); + if (job != null) { if (rescheduleIfExists) { log.debug("Looks like repeating job [" + name + ':' + groupName + "] is already scheduled - removing it so it can be rescheduled");
this.scheduler.deleteJob(name, groupName); + if (!this.scheduler.deleteJob(name, groupName)) { + log.error("Failed to delete job [" + job + "] in order to reschedule it."); + return; + } } else { log.debug("Looks like repeating job [" + name + ':' + groupName + "] is already scheduled - leaving the original job as-is"); @@ -107,12 +112,16 @@ public class EnhancedSchedulerImpl implements EnhancedScheduler { try { // see if the job is already scheduled and if so, // either remove it so we can reschedule it or keep it (based on rescheduleIfExists) - if (this.scheduler.getJobDetail(name, groupName) != null) { + JobDetail job = this.scheduler.getJobDetail(name, groupName); + if (job != null) { if (rescheduleIfExists) { log.debug("Looks like cron job [" + name + ':' + groupName + "] is already scheduled - removing it so it can be rescheduled");
- this.scheduler.deleteJob(name, groupName); + if (!this.scheduler.deleteJob(name, groupName)) { + log.error("Failed to delete job [" + job + "] in order to reschedule it."); + return; + } } else { log.debug("Looks like cron job [" + name + ':' + groupName + "] is already scheduled - leaving the original job as-is"); @@ -142,7 +151,7 @@ public class EnhancedSchedulerImpl implements EnhancedScheduler { Date next = this.scheduler.scheduleJob(job, trigger);
log.info("Scheduled cron job [" + name + ':' + groupName + "] to fire next at [" + next - + "] with the cronString of [" + cronString + "]"); + + "] with the cronString of [" + cronString + "].");
return; }
rhq-commits@lists.fedorahosted.org