[Hyperic-hq-discuss] hq r10547 - in trunk/src/org/hyperic/hq: bizapp/server/session galerts/server/session

[<sc...@hy...>]

Author: scottmf
Date: 2008-08-06 14:37:45 -0700 (Wed, 06 Aug 2008)
New Revision: 10547
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=10547

Modified:
   trunk/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java
   trunk/src/org/hyperic/hq/galerts/server/session/GalertLog.java
Log:
[HQ-1346] fixed up group logic for associating an acknowledged state with an escalation

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java	2008-08-06 21:30:50 UTC (rev 10546)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java	2008-08-06 21:37:45 UTC (rev 10547)
@@ -225,7 +225,7 @@
             }
             // a galert always has an associated escalation which may or may not
             // be acknowledged.
-            if (!galert.isAcknowledgeable()) {
+            if (galert.hasEscalationState() && galert.isAcknowledged()) {
                 rtn = ALERT_WARN;
             } else {
                 return ALERT_CRITICAL;

Modified: trunk/src/org/hyperic/hq/galerts/server/session/GalertLog.java
===================================================================
--- trunk/src/org/hyperic/hq/galerts/server/session/GalertLog.java	2008-08-06 21:30:50 UTC (rev 10546)
+++ trunk/src/org/hyperic/hq/galerts/server/session/GalertLog.java	2008-08-06 21:37:45 UTC (rev 10547)
@@ -192,6 +192,14 @@
         return _stateId;
     }
     
+    public boolean isAcknowledged() {
+        return getAckedBy() != null;
+    }
+
+    public boolean hasEscalationState() {
+        return getStateId() != null;
+    }
+
     public boolean isAcknowledgeable() {
         return getStateId() != null && getAckedBy() == null;
     }