[jboss-svn-commits] JBL Code SVN: r20320 - labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server.

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

Author: beve
Date: 2008-06-05 03:39:34 -0400 (Thu, 05 Jun 2008)
New Revision: 20320

Modified:
   labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
Log:
Work for JBESB-1647 "Management part of console only shows node"


Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java	2008-06-05 06:21:30 UTC (rev 20319)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java	2008-06-05 07:39:34 UTC (rev 20320)
@@ -87,7 +87,32 @@
 		}
 	 	return null;
 	}
+	
+	/**
+	 * Gets the operations that match the passed in arguements.
+	 * 
+	 * @param sess session 
+	 * @param objectname object name
+	 * @param attribute attribute name
+	 * @param servername servername
+	 * @return JMXAttribute
+	 */
+	public JMXOperation getOperation(Session sess, String objectname, String operation, String servername) {
+		String query = "from JMXOperation jmxo "
+					+ "where objectname = :objectname and operation = :operation and servername = :servername";
+				
+		List result = sess.createQuery(query)
+			.setString("objectname", objectname)
+			.setString("operation", operation)
+			.setString("servername", servername).list();
 		
+		if (result.size() > 0) {
+			JMXOperation jmxo = (JMXOperation) result.get(0);
+			return jmxo;
+		}
+	 	return null;
+	}
+		
 	/**
 	 * Create a JMXAttribute object based on the StatisticBean info and stores it.
 	 * @param f_sb statistics bean
@@ -113,7 +138,7 @@
 			sess = (Session) MonitoringSessionFactory.getInstance().openSession();
 			tx = sess.beginTransaction();
 
-			JMXOperation oper = getOperation(sess, f_ob.getObjectName(), f_ob.getOperation());
+			JMXOperation oper = getOperation(sess, f_ob.getObjectName(), f_ob.getOperation(), f_ob.getServer());
 			if (oper == null) {
 				oper = new JMXOperation(f_ob.getObjectName(), f_ob.getServer(), f_ob.getOperation(),
 						f_ob.getDescription(), f_ob.getReturntype(), true);