java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java |
11 ++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 557a08eea27445e93aa206a985f84ed3aeda8b97
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jun 25 10:09:26 2013 +0200
695638 - rewrite C style to java
+ do not skip the following channel right after a proxy channel
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
index 03fadcd..3087dac 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
@@ -36,6 +36,7 @@ import org.cobbler.Distro;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -179,10 +180,12 @@ public class KickstartSoftwareEditAction extends
BaseKickstartEditAction {
if (childchannels == null || childchannels.size() == 0) {
ctx.getRequest().setAttribute("nochildchannels",
"true");
}
- // Remove the Proxy channels from the child channel list
- for (int i = 0; i < childchannels.size(); i++) {
- if (childchannels.get(i).isProxy()) {
- childchannels.remove(i);
+ else {
+ // Remove the Proxy channels from the child channel list
+ for (Iterator<Channel> iter = childchannels.iterator();
iter.hasNext();) {
+ if (iter.next().isProxy()) {
+ iter.remove();
+ }
}
}
log.debug("AVAIL_CHILD_CHANNELS: " + childchannels);