modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
| 6 +++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
| 7 ++-----
2 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 66b7130a35f1c0f87d460eda8a094ed99383fac6
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Mon Nov 30 16:31:49 2009 -0500
One more renaming.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
index 384c948..450a905 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
@@ -224,7 +224,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
// make sure we stop its adapter and unschedule any sync job associated with
it
try {
ContentServerPluginContainer pc =
ContentManagerHelper.getPluginContainer();
- pc.unscheduleSyncJob(cs);
+ pc.unscheduleProviderSyncJob(cs);
pc.getAdapterManager().shutdownAdapter(cs);
} catch (Exception e) {
log.warn("Failed to shutdown adapter for [" + cs +
"]", e);
@@ -477,7 +477,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
+ "]. Will now unschedule the old sync job");
try {
ContentServerPluginContainer pc =
ContentManagerHelper.getPluginContainer();
- pc.unscheduleSyncJob(loaded);
+ pc.unscheduleProviderSyncJob(loaded);
} catch (Exception e) {
log.warn("Failed to unschedule obsolete content source sync job for
[" + loaded + "]", e);
}
@@ -492,7 +492,7 @@ public class ContentSourceManagerBean implements
ContentSourceManagerLocal {
// synchronize it now, too
try {
ContentServerPluginContainer pc = ContentManagerHelper.getPluginContainer();
- pc.unscheduleSyncJob(contentSource);
+ pc.unscheduleProviderSyncJob(contentSource);
pc.getAdapterManager().restartAdapter(contentSource);
pc.scheduleProviderSyncJob(contentSource);
pc.syncProviderNow(contentSource);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
index 97e270e..9a79c88 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java
@@ -169,18 +169,15 @@ public class ContentServerPluginContainer extends
AbstractTypeServerPluginContai
* This will unschedule the sync job for the given content source. Once unscheduled,
the content source's adapter
* will not be asked to synchronize with the remote content source.
*
- * @param contentSource
+ * @param contentSource cannot be <code>null</code>
*
* @throws SchedulerException if failed to unschedule the job
*/
- public void unscheduleSyncJob(ContentSource contentSource) throws SchedulerException
{
+ public void unscheduleProviderSyncJob(ContentSource contentSource) throws
SchedulerException {
SchedulerLocal scheduler = LookupUtil.getSchedulerBean();
scheduler.deleteJob(ContentProviderSyncJob.createJobName(contentSource),
SYNC_JOB_GROUP_NAME);
-
- return;
}
- @Override
protected ServerPluginManager createPluginManager() {
return new ContentServerPluginManager(this);
}
Show replies by date