java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java | 13 ---------- java/spacewalk-java.spec | 5 +++ rel-eng/packages/spacewalk-java | 2 - 3 files changed, 6 insertions(+), 14 deletions(-)
New commits: commit 40e69ef90030d877020b093af26c0ff20a5bff24 Author: Tomas Lestach tlestach@redhat.com Date: Fri Nov 29 18:09:07 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.85-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index cb4e382..5a9166b 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.84 +Version: 2.1.85 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Fri Nov 29 2013 Tomas Lestach tlestach@redhat.com 2.1.85-1 +- 1034851 - fix SSM child channel membership changes + * Fri Nov 29 2013 Michael Mraka michael.mraka@redhat.com 2.1.84-1 - Allow UTF-8 in config file - Reformat so less unnecessary whitespace gets to output diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 4ae88fb..7180261 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.84-1 java/ +2.1.85-1 java/
commit 722cd4e4588b4419fd24e15b912583b2fe93de9f Author: Tomas Lestach tlestach@redhat.com Date: Fri Nov 29 18:00:03 2013 +0100
1034851 - fix SSM child channel membership changes
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java index 177fdab..ab60b0b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java @@ -28,7 +28,6 @@ import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.ssm.SsmManager; import com.redhat.rhn.manager.ssm.SsmOperationManager;
@@ -97,14 +96,6 @@ public class ChildChannelConfirmAction extends RhnAction implements Listable { ListHelper helper = new ListHelper(this, request); helper.execute();
- RhnSet subSet = RhnSetDecl.SSM_CHANNEL_SUBSCRIBE.get(user); - subSet.clear(); - RhnSetManager.store(subSet); - - RhnSet unSubSet = RhnSetDecl.SSM_CHANNEL_UNSUBSCRIBE.get(user); - unSubSet.clear(); - RhnSetManager.store(unSubSet); - ActionForward result; if (isSubmitted(daForm)) {
@@ -112,9 +103,7 @@ public class ChildChannelConfirmAction extends RhnAction implements Listable { "ssm.subscription.operation.label", null);
SsmOperationManager.associateServersWithOperation(operationId, user.getId(), - RhnSetDecl.SSM_CHANNEL_SUBSCRIBE.getLabel()); - SsmOperationManager.associateServersWithOperation(operationId, user.getId(), - RhnSetDecl.SSM_CHANNEL_UNSUBSCRIBE.getLabel()); + new ArrayList<Long>(sysSubList.keySet()));
// Fire the request off asynchronously SsmChangeChannelSubscriptionsEvent event =