Modified: trunk/hudson/plugins/monitoring/pom.xml (40805 => 40806)
--- trunk/hudson/plugins/monitoring/pom.xml 2013-01-22 22:08:30 UTC (rev 40805)
+++ trunk/hudson/plugins/monitoring/pom.xml 2013-01-27 22:24:17 UTC (rev 40806)
@@ -39,7 +39,7 @@
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
- <version>1.42.0</version>
+ <version>1.43.0</version>
</dependency>
<!-- jrobin dependency is included in javamelody-core
<dependency>
Modified: trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java (40805 => 40806)
--- trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java 2013-01-22 22:08:30 UTC (rev 40805)
+++ trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/NodesController.java 2013-01-27 22:24:17 UTC (rev 40806)
@@ -19,6 +19,7 @@
package net.bull.javamelody;
import static net.bull.javamelody.HttpParameters.ACTION_PARAMETER;
+import static net.bull.javamelody.HttpParameters.CACHE_ID_PARAMETER;
import static net.bull.javamelody.HttpParameters.FORMAT_PARAMETER;
import static net.bull.javamelody.HttpParameters.HEAP_HISTO_PART;
import static net.bull.javamelody.HttpParameters.HTML_CONTENT_TYPE;
@@ -90,8 +91,9 @@
final String sessionId = req.getParameter(SESSION_ID_PARAMETER);
final String threadId = req.getParameter(THREAD_ID_PARAMETER);
final String jobId = req.getParameter(JOB_ID_PARAMETER);
+ final String cacheId = req.getParameter(CACHE_ID_PARAMETER);
messageForReport = RemoteCallHelper.forwardAction(actionName, sessionId,
- threadId, jobId);
+ threadId, jobId, cacheId);
} else {
// necessaire si action clear_counter
messageForReport = monitoringController.executeActionIfNeeded(req);
Modified: trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/RemoteCallHelper.java (40805 => 40806)
--- trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/RemoteCallHelper.java 2013-01-22 22:08:30 UTC (rev 40805)
+++ trunk/hudson/plugins/monitoring/src/main/java/net/bull/javamelody/RemoteCallHelper.java 2013-01-27 22:24:17 UTC (rev 40806)
@@ -77,19 +77,22 @@
private final String sessionId;
private final String threadId;
private final String jobId;
+ private final String cacheId;
- ActionTask(String actionName, String sessionId, String threadId, String jobId) {
+ ActionTask(String actionName, String sessionId, String threadId, String jobId,
+ String cacheId) {
super();
this.actionName = actionName;
this.sessionId = sessionId;
this.threadId = threadId;
this.jobId = jobId;
+ this.cacheId = cacheId;
}
@Override
public String call() throws Throwable {
final Action action = ""
- return action.execute(null, null, null, sessionId, threadId, jobId);
+ return action.execute(null, null, null, sessionId, threadId, jobId, cacheId);
}
}
@@ -192,9 +195,9 @@
return heapHistoTotal;
}
- static String forwardAction(String actionName, String sessionId, String threadId, String jobId)
- throws IOException, InterruptedException, ExecutionException {
- final ActionTask task = new ActionTask(actionName, sessionId, threadId, jobId);
+ static String forwardAction(String actionName, String sessionId, String threadId, String jobId,
+ String cacheId) throws IOException, InterruptedException, ExecutionException {
+ final ActionTask task = new ActionTask(actionName, sessionId, threadId, jobId, cacheId);
final Map<String, String> messagesByNodeName = collectDataByNodeName(task);
final StringBuilder sb = new StringBuilder();
for (final String messageForReport : messagesByNodeName.values()) {
