Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2853] defensive coding against stale values in dashboard-based web user preferences (related to RHQ-148)
|
From: <jma...@rh...> - 2009-01-30 20:56:12
|
<!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] [2853] defensive coding against stale values in dashboard-based web user preferences (related to RHQ-148)</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2853</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-01-30 14:56:07 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>defensive coding against stale values in dashboard-based web user preferences (related to RHQ-148)</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedViewActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedViewActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java (2852 => 2853)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java 2009-01-30 18:39:07 UTC (rev 2852) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java 2009-01-30 20:56:07 UTC (rev 2853) </span><span class="lines">@@ -81,11 +81,16 @@ </span><span class="cx"> // Set the show servers flag on all expanded platforms. // Find the list of expanded platforms for this user and make it available to the jsp. </span><span class="rem">- List<String> expandedPlatforms = recentlyApprovedPreferences.expandedPlatforms; </span><span class="cx"> List<String> removeExpandedPlatforms = new ArrayList<String>(); </span><span class="rem">- for (String expandedPlatform : expandedPlatforms) { - Integer platformId = Integer.valueOf(expandedPlatform); </span><span class="add">+ for (String expandedPlatform : recentlyApprovedPreferences.expandedPlatforms) { + Integer platformId = null; + try { + platformId = Integer.valueOf(expandedPlatform); + } catch (NumberFormatException nfe) { + removeExpandedPlatforms.add(expandedPlatform); + continue; + } </span><span class="cx"> RecentlyAddedResourceComposite miniPlatform = platformMap.get(platformId); if (miniPlatform != null) { miniPlatform.setShowChildren(true); </span><span class="lines">@@ -96,8 +101,12 @@ </span><span class="cx"> } } </span><span class="rem">- // we do this just to clean up the preferences for platforms that are no longer recently approved - expandedPlatforms.removeAll(removeExpandedPlatforms); </span><span class="add">+ // we do this just to clean up the preferences for platforms in the filter list which no longer exist + if (removeExpandedPlatforms.size() > 0) { + recentlyApprovedPreferences.expandedPlatforms.removeAll(removeExpandedPlatforms); + preferences.setRecentlyApprovedPortletPreferences(recentlyApprovedPreferences); + preferences.persistPreferences(); + } </span><span class="cx"> // Make the list available to the jsp. </span> </pre> </div> </div> </body> </html> |
