-
Bug
-
Resolution: Done
-
Blocker
-
4.2.0.Beta3
-
None
org.jboss.tools.jmx.jvmmonitor.internal.core.cpu.CpuProfiler
/* * @see ICpuProfiler#getSamplingPeriod() */ @Override public Integer getSamplingPeriod() { IMBeanServer s = jvm.getMBeanServer(); <<<<<<< HEAD if( s != null && s instanceof IProfilingMBeanServer) return ((IProfilingMBeanServer)s).getSamplingPeriod(); ======= if( s != null && s instanceof IProfilingMBeanServer) { return ((IProfilingMBeanServer)s).getSamplingPeriod(); } >>>>>>> JBIDE-17311 - moving the jvmmonitor agent code into our plugins folder. return -1; }
- relates to
-
JBIDE-17311 jvmmonitor agent project moved + renamed into jbt-server repo
- Closed