java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ff46da02b53f59332282a1c0f9fd2b37e473949
Author: Jeff Ortel <jortel(a)redhat.com>
Date: Thu Aug 13 14:05:24 2009 -0500
494409 - Update TrustAction to removed shared subscriptions before removing trusts
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
index 81f37f5..acaef1c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
@@ -255,7 +255,6 @@ public class TrustAction extends FormDispatcher {
User orgUser = UserFactory.findRandomOrgAdmin(theOrg);
for (Org removed : getRemoved(theOrg, set)) {
- theOrg.removeTrust(removed);
User orgAdmin = UserFactory.findRandomOrgAdmin(removed);
DataResult<Map> dr =
SystemManager.subscribedInOrgTrust(theOrg.getId(), removed.getId());
@@ -284,6 +283,7 @@ public class TrustAction extends FormDispatcher {
ChannelFactory.save(channel);
SystemManager.unsubscribeServerFromChannel(orgUser, sid, cid);
}
+ theOrg.removeTrust(removed);
}
OrgFactory.save(theOrg);
Show replies by date