java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java |
7 -------
1 file changed, 7 deletions(-)
New commits:
commit 68f49fcff44f00c90ed0bb7639e4a93e656f37ef
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Apr 11 11:23:37 2012 -0400
698940 - Activation Key does not have to have a base channel to add Child Channels
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
index 93eb3e1..e8ef194 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
@@ -480,13 +480,6 @@ public class ActivationKeyHandler extends BaseHandler {
" is not a child channel.");
}
- // Verify we have access to the child's parent channel:
- Channel parentChannel = childChannel.getParentChannel();
- if (!activationKey.getChannels().contains(parentChannel)) {
- throw new InvalidChannelException("Key has not been assigned base
" +
- "channel for " + childChannel.getName());
- }
-
manager.addChannel(activationKey, childChannel);
}
Show replies by date