java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 5
-----
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 7
+------
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 2
+-
3 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 51d2ffe57f5ed3d8ccad31635923cfad8c9aa08c
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Jun 22 15:51:17 2010 -0400
remove call to repo task from the channel edit/update cmds
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index c4735c2..04bffb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -169,11 +169,6 @@ public class EditChannelAction extends RhnAction implements Listable
{
params);
}
- if (errors.isEmpty() && form.get("sync_repo") != null) {
- createSuccessMessage(request, "message.syncscheduled",
- form.getString("name"));
- }
-
return getStrutsDelegate().forwardParams(
mapping.findForward("success"), params);
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
index 94f5014..abd6936 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
@@ -89,12 +89,7 @@ public class UpdateChannelCommand extends CreateChannelCommand {
c.setMaintainerEmail(maintainerEmail);
c.setMaintainerPhone(maintainerPhone);
c.setSupportPolicy(supportPolicy);
-
- if (syncRepo && !c.getSources().isEmpty()) {
- TaskFactory.createTask(user.getOrg(), RepoSyncTask.DISPLAY_NAME,
- c.getSources().iterator().next().getId());
- }
-
+
// need to save before calling stored proc below
ChannelFactory.save(c);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index 76dbb0a..542d67e 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -70,7 +70,7 @@ public class RepoSyncTask implements Job {
continue;
}
Channel c = ChannelFactory.lookupById(task.getData());
- if (log.isInfoEnabled()) {
+ if (log.isInfoEnabled() && c != null) {
log.info("Syncing repos for channel: " + c.getName());
}
if (c == null) {
Show replies by date