Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3776] [RHQ-1973] avoid concurrent modification exceptions when removing a role that has 2 or more groups associated with it.
|
From: <ma...@rh...> - 2009-04-16 18:22:58
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3776] [RHQ-1973] avoid concurrent modification exceptions when removing a role that has 2 or more groups associated with it.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3776</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2009-04-16 13:22:24 -0500 (Thu, 16 Apr 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1973] avoid concurrent modification exceptions when removing a role that has 2 or more groups associated with it. I suspect the same issue would have happened if you have 2 or more subjects associated with the role too - this should fix that as well.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverauthzRoleManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverauthzRoleManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java (3775 => 3776)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java 2009-04-16 18:07:51 UTC (rev 3775) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java 2009-04-16 18:22:24 UTC (rev 3776) </span><span class="lines">@@ -20,6 +20,7 @@ </span><span class="cx"> import java.util.ArrayList; import java.util.Arrays; </span><span class="add">+import java.util.HashSet; </span><span class="cx"> import java.util.List; import java.util.Set; </span><span class="lines">@@ -139,12 +140,14 @@ </span><span class="cx"> deleteNotificationQuery.setParameter("roleId", role_id); deleteNotificationQuery.executeUpdate(); // discard result, might not have been set for any notifications </span><span class="rem">- for (Subject doomedSubjectRelationship : doomedRole.getSubjects()) { </span><span class="add">+ Set<Subject> subjectsToUnhook = new HashSet<Subject>(doomedRole.getSubjects()); // avoid concurrent mod exception + for (Subject doomedSubjectRelationship : subjectsToUnhook) { </span><span class="cx"> doomedRole.removeSubject(doomedSubjectRelationship); entityManager.merge(doomedSubjectRelationship); } </span><span class="rem">- for (ResourceGroup doomedResourceGroupRelationship : doomedRole.getResourceGroups()) { </span><span class="add">+ Set<ResourceGroup> groupsToUnhook = new HashSet<ResourceGroup>(doomedRole.getResourceGroups()); // avoid concurrent mod exception + for (ResourceGroup doomedResourceGroupRelationship : groupsToUnhook) { </span><span class="cx"> doomedRole.removeResourceGroup(doomedResourceGroupRelationship); entityManager.merge(doomedResourceGroupRelationship); } </span> </pre> </div> </div> </body> </html> |