java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3a3b68f77be2c06569582092df21d923a334ca4e
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Wed Jun 26 11:22:35 2013 +0200
976136 - we need unentitle channels before we delete them
diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
index 6c11bd9..06998d9 100644
--- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
@@ -135,9 +135,6 @@ public class MigrationManager extends BaseManager {
// Remove custom data values (aka System->CustomInfo)
ServerFactory.removeCustomDataValues(server);
- // Remove existing channels
- server.getChannels().clear();
-
// Remove existing config channels
if (server.getConfigChannelCount() > 0) {
server.getConfigChannels().clear();
@@ -177,6 +174,9 @@ public class MigrationManager extends BaseManager {
}
SystemManager.removeAllServerEntitlements(server.getId());
+
+ // Remove existing channels
+ server.getChannels().clear();
}
/**
Show replies by thread