Modified: trunk/hudson/plugins/monitoring/pom.xml (40712 => 40713)
--- trunk/hudson/plugins/monitoring/pom.xml 2012-09-27 02:13:50 UTC (rev 40712)
+++ trunk/hudson/plugins/monitoring/pom.xml 2012-09-29 13:10:47 UTC (rev 40713)
@@ -39,7 +39,7 @@
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
- <version>1.40.0</version>
+ <version>1.41.0-SNAPSHOT</version>
</dependency>
<!-- jrobin dependency is included in javamelody-core
<dependency>
Modified: trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java (40712 => 40713)
--- trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java 2012-09-27 02:13:50 UTC (rev 40712)
+++ trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java 2012-09-29 13:10:47 UTC (rev 40713)
@@ -97,15 +97,15 @@
messageForReport = monitoringController.executeActionIfNeeded(req);
}
if (TransportFormat.isATransportFormat(req.getParameter(FORMAT_PARAMETER))) {
- final Range range = monitoringController.getRangeForSerializable(req);
- final List<Object> serializable = new ArrayList<Object>();
+ final SerializableController serializableController = new SerializableController(
+ collector);
+ final Range range = serializableController.getRangeForSerializable(req);
final List<JavaInformations> javaInformationsList = RemoteCallHelper
.collectJavaInformationsList();
- serializable.addAll((List<?>) monitoringController
- .createDefaultSerializable(javaInformationsList, range));
- serializable.add(messageForReport);
- monitoringController.doCompressedSerializable(req, resp,
- (Serializable) serializable);
+ final Serializable serializable = serializableController
+ .createDefaultSerializable(javaInformationsList, range,
+ messageForReport);
+ monitoringController.doCompressedSerializable(req, resp, serializable);
} else {
writeMessage(resp, messageForReport, partParameter);
}
@@ -299,15 +299,14 @@
throws IOException {
Serializable serializable;
try {
- serializable = createSerializable(httpRequest, monitoringController);
+ serializable = createSerializable(httpRequest);
} catch (final Exception e) {
serializable = e;
}
monitoringController.doCompressedSerializable(httpRequest, httpResponse, serializable);
}
- private Serializable createSerializable(HttpServletRequest httpRequest,
- MonitoringController monitoringController) throws Exception { // NOPMD
+ private Serializable createSerializable(HttpServletRequest httpRequest) throws Exception { // NOPMD
final String part = httpRequest.getParameter(PART_PARAMETER);
if (MBEANS_PART.equalsIgnoreCase(part)) {
return new LinkedHashMap<String, List<MBeanNode>>(
@@ -328,7 +327,9 @@
// utile pour JROBINS_PART, OTHER_JROBINS_PART, SESSIONS_PART et
// defaultSerializable notamment
- return monitoringController.createSerializable(httpRequest, lastJavaInformationsList);
+ final SerializableController serializableController = new SerializableController(collector);
+ return serializableController.createSerializable(httpRequest, lastJavaInformationsList,
+ null);
}
private HtmlReport createHtmlReport(HttpServletRequest req, HttpServletResponse resp,
