Mercurial > hg > thermostat-ng > agent

changeset 1773:4fe63570c611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix gui heap dump PR2477 Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-June/014288.html
author Jie Kang <jkang@redhat.com>
date Fri, 26 Jun 2015 16:31:02 -0400
parents b0969b897c25
children 5cc6faab7e19
files vm-heap-analysis/client-core/src/main/java/com/redhat/thermostat/vm/heap/analysis/client/core/internal/HeapDumper.java vm-heap-analysis/client-core/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/core/internal/HeapDumperTest.java vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/DumpHeapCommandTest.java
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/vm-heap-analysis/client-core/src/main/java/com/redhat/thermostat/vm/heap/analysis/client/core/internal/HeapDumper.java	Thu Jun 25 11:06:17 2015 -0400
+++ b/vm-heap-analysis/client-core/src/main/java/com/redhat/thermostat/vm/heap/analysis/client/core/internal/HeapDumper.java	Fri Jun 26 16:31:02 2015 -0400
@@ -61,7 +61,7 @@
     public void dump() throws CommandException {
         ServiceReference launcherRef = context.getServiceReference(Launcher.class.getName());
         Launcher launcher = (Launcher) context.getService(launcherRef);
-        launcher.run(new String[] { "dump-heap", "--hostId", ref.getHostRef().getStringID(), "--vmId", ref.getVmId() }, true);
+        launcher.run(new String[] { "dump-heap", "--vmId", ref.getVmId() }, true);
     }
 
 }
--- a/vm-heap-analysis/client-core/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/core/internal/HeapDumperTest.java	Thu Jun 25 11:06:17 2015 -0400
+++ b/vm-heap-analysis/client-core/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/core/internal/HeapDumperTest.java	Fri Jun 26 16:31:02 2015 -0400
@@ -83,7 +83,7 @@
         verifyNoMoreInteractions(launcher);
 
         String[] args = captor.getValue();
-        assertArrayEquals(new String[] { "dump-heap", "--hostId", TEST_HOST_ID, "--vmId", String.valueOf(TEST_VM_ID) }, args);
+        assertArrayEquals(new String[] { "dump-heap", "--vmId", String.valueOf(TEST_VM_ID) }, args);
     }
 
 }
--- a/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/DumpHeapCommandTest.java	Thu Jun 25 11:06:17 2015 -0400
+++ b/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/DumpHeapCommandTest.java	Fri Jun 26 16:31:02 2015 -0400
@@ -69,6 +69,12 @@
     private static final Translate<LocaleResources> TRANSLATOR = LocaleResources
             .createLocalizer();
 
+    /**
+     * The GUI heap dump relies on this command with particular input. Any changes to DumpHeapCommand
+     * should also be checked against the HeapDumper.
+     *
+     * See com.redhat.thermostat.vm.heap.analysis.client.core.internal.HeapDumper.dump()
+     */
     @Test
     public void verifyActuallyCallsWorker() throws CommandException {
         VmInfoDAO vmInfoDao = mock(VmInfoDAO.class);