Title: [40697] trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java: correction pour jrobins, otherJRobins et mbeans dans UI Swing avec jenkins nodes
- Revision
- 40697
- Author
- evernat
- Date
- 2012-09-01 17:08:03 -0400 (Sat, 01 Sep 2012)
Log Message
correction pour jrobins, otherJRobins et mbeans dans UI Swing avec jenkins nodes
Modified Paths
Diff
Modified: trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java (40696 => 40697)
--- trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java 2012-08-26 15:52:59 UTC (rev 40696)
+++ trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java 2012-09-01 21:08:03 UTC (rev 40697)
@@ -301,11 +301,14 @@
private Serializable createSerializable(HttpServletRequest httpRequest,
MonitoringController monitoringController) throws Exception { // NOPMD
final String part = httpRequest.getParameter(PART_PARAMETER);
- if (HEAP_HISTO_PART.equalsIgnoreCase(part)) {
- return RemoteCallHelper.collectGlobalHeapHistogram();
+ if (MBEANS_PART.equalsIgnoreCase(part)) {
+ return new LinkedHashMap<String, List<MBeanNode>>(
+ RemoteCallHelper.collectMBeanNodesByNodeName());
} else if (PROCESSES_PART.equalsIgnoreCase(part)) {
return new LinkedHashMap<String, List<ProcessInformations>>(
RemoteCallHelper.collectProcessInformationsByNodeName());
+ } else if (HEAP_HISTO_PART.equalsIgnoreCase(part)) {
+ return RemoteCallHelper.collectGlobalHeapHistogram();
} else if (THREADS_PART.equalsIgnoreCase(part)) {
final ArrayList<List<ThreadInformations>> result = new ArrayList<List<ThreadInformations>>();
for (final JavaInformations javaInformations : lastJavaInformationsList) {
@@ -315,8 +318,10 @@
return result;
}
- final Range range = monitoringController.getRangeForSerializable(httpRequest);
- return monitoringController.createDefaultSerializable(lastJavaInformationsList, range);
+ // utile pour JROBINS_PART, OTHER_JROBINS_PART, SESSIONS_PART et
+ // defaultSerializable notamment
+ return monitoringController.createSerializable(httpRequest,
+ lastJavaInformationsList);
}
private HtmlReport createHtmlReport(HttpServletRequest req, HttpServletResponse resp,