[jboss-svn-commits] JBL Code SVN: r17793 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring: client and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jan 13 14:17:28 EST 2008
Author: mark.little at jboss.com
Date: 2008-01-13 14:17:28 -0500 (Sun, 13 Jan 2008)
New Revision: 17793
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1472
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2008-01-13 14:43:08 UTC (rev 17792)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2008-01-13 19:17:28 UTC (rev 17793)
@@ -79,7 +79,7 @@
try {
sessionFactory = new Configuration().configure("monitoring.cfg.xml").buildSessionFactory();
} catch (Exception e) {
- m_Logger.error("", e);
+ m_Logger.error("MonitoringSessionFactory failed to initialize!", e);
}
}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java 2008-01-13 14:43:08 UTC (rev 17792)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java 2008-01-13 19:17:28 UTC (rev 17793)
@@ -31,6 +31,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Vector;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanInfo;
@@ -43,6 +44,8 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.StatisticsBean;
@@ -86,11 +89,22 @@
}
public List getClassPatterns() {
- Session sess = (Session) MonitoringSessionFactory.getInstance().openSession();
- sess.beginTransaction();
- List result = sess.createQuery("from JMXPattern").list();
- sess.close();
- return result;
+ SessionFactory sf = MonitoringSessionFactory.getInstance();
+
+ if (sf != null)
+ {
+ Session sess = (Session) sf.openSession();
+ sess.beginTransaction();
+ List result = sess.createQuery("from JMXPattern").list();
+ sess.close();
+ return result;
+ }
+ else
+ {
+ logger.warn("DataCollector.getClassPatterns could not get MonitoringSessionFactory instance!");
+
+ return null;
+ }
}
public List<ObjectName> getObjectNames(JMXPattern jmc, MBeanServerConnection server) {
@@ -157,14 +171,20 @@
public void collectData() {
List jmxPatterns = getClassPatterns();
- for (int i = 0; i < jmxPatterns.size(); i++) {
- JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
- List<ObjectName> objectNames = getObjectNames(jmxc, server);
- for (int j = 0; j < objectNames.size(); j++) {
- ObjectName on = (ObjectName) objectNames.get(j);
- insertAttributes(on);
+
+ if (jmxPatterns != null)
+ {
+ for (int i = 0; i < jmxPatterns.size(); i++) {
+ JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
+ List<ObjectName> objectNames = getObjectNames(jmxc, server);
+ for (int j = 0; j < objectNames.size(); j++) {
+ ObjectName on = (ObjectName) objectNames.get(j);
+ insertAttributes(on);
+ }
}
}
+ else
+ logger.debug("DataCollector.collectData has no jmxPatterns!");
}
public StatisticsData getData() {
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2008-01-13 14:43:08 UTC (rev 17792)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2008-01-13 19:17:28 UTC (rev 17793)
@@ -44,6 +44,8 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
@@ -79,11 +81,22 @@
}
public List getClassPatterns() {
- Session sess = (Session) MonitoringSessionFactory.getInstance().openSession();
- sess.beginTransaction();
- List result = sess.createQuery("from JMXPattern").list();
- sess.close();
- return result;
+ SessionFactory sf = MonitoringSessionFactory.getInstance();
+
+ if (sf != null)
+ {
+ Session sess = (Session) sf.openSession();
+ sess.beginTransaction();
+ List result = sess.createQuery("from JMXPattern").list();
+ sess.close();
+ return result;
+ }
+ else
+ {
+ logger.warn("OperationsCollector.getClassPatterns could not get MonitoringSessionFactory instance!");
+
+ return null;
+ }
}
public List<ObjectName> getObjectNames(JMXPattern jmc, MBeanServerConnection server) {
@@ -150,14 +163,20 @@
public void collectData() {
List jmxPatterns = getClassPatterns();
- for (int i = 0; i < jmxPatterns.size(); i++) {
- JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
- List<ObjectName> objectNames = getObjectNames(jmxc, server);
- for (int j = 0; j < objectNames.size(); j++) {
- ObjectName on = (ObjectName) objectNames.get(j);
- insertOperations(on);
+
+ if (jmxPatterns != null)
+ {
+ for (int i = 0; i < jmxPatterns.size(); i++) {
+ JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
+ List<ObjectName> objectNames = getObjectNames(jmxc, server);
+ for (int j = 0; j < objectNames.size(); j++) {
+ ObjectName on = (ObjectName) objectNames.get(j);
+ insertOperations(on);
+ }
}
}
+ else
+ logger.debug("OperationsCollector.collectData has no jmxPatterns!");
}
public OperationsData getData() {
More information about the jboss-svn-commits
mailing list