Skip to content

Commit 1ccd60f

Browse files
committed
do not hard-code module name
1 parent 5a1d215 commit 1ccd60f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/cpu/ThreadInfoProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
import javax.management.ObjectName;
4848
import javax.management.ReflectionException;
4949
import org.openide.modules.InstalledFileLocator;
50+
import org.openide.modules.ModuleInfo;
51+
import org.openide.modules.Modules;
5052
import org.openide.util.Exceptions;
5153
import org.openide.util.NbBundle;
5254

@@ -178,7 +180,8 @@ private static void loadAgentIntoTargetJVM(final VirtualMachine virtualMachine,
178180

179181
private String getAgentPath() {
180182
InstalledFileLocator loc = InstalledFileLocator.getDefault();
181-
File jar = loc.locate(AGENT_PATH, "org.graalvm.visualvm.sampler.truffle", false); // NOI18N
183+
ModuleInfo info = Modules.getDefault().ownerOf(getClass());
184+
File jar = loc.locate(AGENT_PATH, info.getCodeNameBase(), false);
182185

183186
return jar.getAbsolutePath();
184187
}

visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/memory/MemoryHistogramProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
import org.graalvm.visualvm.tools.jmx.JmxModel;
4747
import org.graalvm.visualvm.tools.jmx.JmxModelFactory;
4848
import org.openide.modules.InstalledFileLocator;
49+
import org.openide.modules.ModuleInfo;
50+
import org.openide.modules.Modules;
4951
import org.openide.util.Exceptions;
5052
import org.openide.util.NbBundle;
5153

@@ -152,7 +154,8 @@ boolean loadAgent(Application app) {
152154

153155
private String getAgentPath() {
154156
InstalledFileLocator loc = InstalledFileLocator.getDefault();
155-
File jar = loc.locate(AGENT_PATH, "org.graalvm.visualvm.sampler.truffle", false); // NOI18N
157+
ModuleInfo info = Modules.getDefault().ownerOf(getClass());
158+
File jar = loc.locate(AGENT_PATH, info.getCodeNameBase(), false);
156159

157160
return jar.getAbsolutePath();
158161
}

0 commit comments

Comments
 (0)