[Hyperic-hq-discuss] hq r14299 - trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-02-16 14:28:55 -0800 (Tue, 16 Feb 2010)
New Revision: 14299
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14299

Modified:
   trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java
Log:
Missed a null check, added it

Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java	2010-02-16 22:19:32 UTC (rev 14298)
+++ trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java	2010-02-16 22:28:55 UTC (rev 14299)
@@ -148,7 +148,7 @@
                 request.setAttribute(Constants.CAN_VIEW_RESOURCE_TYPE_ALERT_TEMPLATE_ATTR, false);
                 
                 // ...is this alert definition spawned from a resource alert template?..
-                if (adv.getParentId() > 0) {
+                if (adv.getParentId() != null && adv.getParentId() > 0) {
                     // ...if so, check to see if we have permission to view it...
                     SessionBase.canViewResourceTypeAlertDefinitionTemplate(subject);