Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [1883] RHQ-1034 - fix navigation error that causes NullPointExceptions when setting the SNMP trap notification information on an alert template;
<!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] [1883] RHQ-1034 - fix navigation error that causes NullPointExceptions when setting the SNMP trap notification information on an alert template; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1883</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2008-11-04 18:59:40 -0600 (Tue, 04 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>RHQ-1034 - fix navigation error that causes NullPointExceptions when setting the SNMP trap notification information on an alert template; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyactionresourcecommonmonitoralertsconfigSnmpTrapFormActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SnmpTrapFormAction.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyactionresourcecommonmonitoralertsconfigSnmpTrapFormActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SnmpTrapFormAction.java (1882 => 1883)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SnmpTrapFormAction.java 2008-11-04 23:49:11 UTC (rev 1882) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SnmpTrapFormAction.java 2008-11-05 00:59:40 UTC (rev 1883) </span><span class="lines">@@ -20,17 +20,20 @@ </span><span class="cx"> import java.util.HashMap; import java.util.Map; </span><span class="add">+ </span><span class="cx"> import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; </span><span class="add">+ </span><span class="cx"> import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.jetbrains.annotations.Nullable; </span><span class="rem">-import org.rhq.core.domain.auth.Subject; </span><span class="add">+ </span><span class="cx"> import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.SnmpNotification; </span><span class="add">+import org.rhq.core.domain.auth.Subject; </span><span class="cx"> import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.legacy.Constants; </span><span class="lines">@@ -101,7 +104,11 @@ </span><span class="cx"> private Map<String, Integer> createRequestParamsMap(SnmpTrapForm snmpTrapForm) { Map<String, Integer> params = new HashMap<String, Integer>(); params.put(Constants.ALERT_DEFINITION_PARAM, snmpTrapForm.getAd()); </span><span class="rem">- params.put(Constants.RESOURCE_ID_PARAM, snmpTrapForm.getId()); </span><span class="add">+ if (snmpTrapForm.isAlertTemplate()) { + params.put(Constants.RESOURCE_TYPE_ID_PARAM, snmpTrapForm.getType()); + } else { + params.put(Constants.RESOURCE_ID_PARAM, snmpTrapForm.getId()); + } </span><span class="cx"> return params; } } \ No newline at end of file </span> </pre> </div> </div> </body> </html> |