[Hyperic-hq-discuss] hq r13943 - branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session

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

Author: dcrutchf
Date: 2009-11-13 11:51:05 -0800 (Fri, 13 Nov 2009)
New Revision: 13943
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13943

Modified:
   branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentDAO.java
   branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentManagerEJBImpl.java
Log:
[HHQ-3535] - Agent connection listing not sorted on platform inventory pages

Overrode findAll call and added ordering by ip, then port

Modified: branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentDAO.java
===================================================================
--- branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentDAO.java	2009-11-13 18:33:48 UTC (rev 13942)
+++ branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentDAO.java	2009-11-13 19:51:05 UTC (rev 13943)
@@ -28,6 +28,7 @@
 import java.util.List;
 
 import org.hibernate.Query;
+import org.hibernate.criterion.Order;
 import org.hyperic.dao.DAOFactory;
 import org.hyperic.hibernate.PageInfo;
 import org.hyperic.hq.appdef.Agent;
@@ -66,6 +67,14 @@
         return ag;
     }
     
+    public List findAll() {
+        return getSession()
+                   .createCriteria(Agent.class)
+                   .addOrder(Order.asc("address"))
+                   .addOrder(Order.asc("port"))
+                   .list();
+    }
+    
     public List findByIP(String ip) {
         String hql = "from Agent where address=:address";
         return getSession()

Modified: branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentManagerEJBImpl.java
===================================================================
--- branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentManagerEJBImpl.java	2009-11-13 18:33:48 UTC (rev 13942)
+++ branches/HQ_4_2/src/org/hyperic/hq/appdef/server/session/AgentManagerEJBImpl.java	2009-11-13 19:51:05 UTC (rev 13943)
@@ -210,7 +210,7 @@
      * @ejb:transaction type="Required"
      */
     public List getAgents(){
-        return new ArrayList(getAgentDAO().findAll());
+        return getAgentDAO().findAll();
     }
 
     /**