[jboss-svn-commits] JBL Code SVN: r15447 - in labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring: server and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2007-09-28 18:35:40 -0400 (Fri, 28 Sep 2007)
New Revision: 15447

Modified:
   labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
   labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsHelper.java
Log:
bug:JBESB-917
Display operation results in descending order, protect against NPE in InvokerAction.


Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java	2007-09-28 22:32:01 UTC (rev 15446)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java	2007-09-28 22:35:40 UTC (rev 15447)
@@ -74,9 +74,15 @@
 					obean.getOperation(), obean.getDescription(), obean.getReturntype(),
 					new Boolean(true));
 			jmxo.setId(obean.getId());
-			JMXOperationResult jmxor = new JMXOperationResult(jmxo,
-					obean.getServer(), new Date(), result.toString());
-			
+			JMXOperationResult jmxor = null;
+			if (result != null) {
+				jmxor = new JMXOperationResult(jmxo,
+						obean.getServer(), new Date(), result.toString());
+			} else {
+				jmxor = new JMXOperationResult(jmxo,
+						obean.getServer(), new Date(), "No result returned.");
+			}
+				
 	        List list = RegistryUtil.getEprs(INTERNAL_CATEGORY, INVOKERFILER_SERVICE_ACTION_NAME);
 	        for (int i = 0; i < list.size(); i++) {
 	        	EPR epr = (EPR)list.get(i);

Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsHelper.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsHelper.java	2007-09-28 22:32:01 UTC (rev 15446)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsHelper.java	2007-09-28 22:35:40 UTC (rev 15447)
@@ -95,7 +95,7 @@
 	public static List getOperationResults(Session sess, String serverName) {
 		String query = "FROM JMXOperationResult jmxr "
 			+ "WHERE jmxr.servername = :servername "
-			+ "ORDER BY jmxr.statdate";
+			+ "ORDER BY jmxr.statdate desc";
 		logger.debug(query);
 		Query q = sess.createQuery(query);
 		q.setString("servername", serverName);