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

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

Author: dcrutchf
Date: 2010-02-24 16:45:15 -0800 (Wed, 24 Feb 2010)
New Revision: 14320
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14320

Modified:
   trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java
   trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java
   trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java
Log:
[HQ-2068] - Group Alerts fires without Escalation Scheme (revised)

Modified: trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java	2010-02-24 23:59:11 UTC (rev 14319)
+++ trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java	2010-02-25 00:45:15 UTC (rev 14320)
@@ -522,7 +522,7 @@
         
         try {
             if (alertType instanceof GalertEscalationAlertType) {
-                isAlertNotFound = (GalertManagerEJBImpl.getOne().findAlertLog(s.getAlertId()) == null);
+                isAlertNotFound = (GalertManagerEJBImpl.getOne().getAlertLog(s.getAlertId()) == null);
             } else if (alertType instanceof ClassicEscalationAlertType) {
                 // HHQ-3499, need to make sure that the alertId that is pointed to by
                 // the escalation still exists

Modified: trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java	2010-02-24 23:59:11 UTC (rev 14319)
+++ trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java	2010-02-25 00:45:15 UTC (rev 14320)
@@ -57,6 +57,10 @@
         return (GalertLog)super.findById(id);
     }
 
+    GalertLog getById(Integer id) {
+        return (GalertLog)super.get(id);
+    }
+
     void save(GalertLog log) {
         super.save(log);
     }

Modified: trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java	2010-02-24 23:59:11 UTC (rev 14319)
+++ trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java	2010-02-25 00:45:15 UTC (rev 14320)
@@ -371,6 +371,13 @@
     /**
      * @ejb:interface-method  
      */
+    public GalertLog getAlertLog(Integer id) {
+        return _logDAO.getById(id);
+    }
+
+    /**
+     * @ejb:interface-method  
+     */
     public GalertLog findAlertLog(Integer id) {
         return _logDAO.findById(id);
     }