Uploaded image for project: 'Tools (JBoss Tools)'
  1. Tools (JBoss Tools)
  2. JBIDE-17798

compile failure in jbosstools-server

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Done
    • Icon: Blocker Blocker
    • 4.2.0.Beta3
    • 4.2.0.Beta3
    • server
    • 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;
          }
      

              rob.stryker Rob Stryker (Inactive)
              dazarov_jira Daniel Azarov (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

                Created:
                Updated:
                Resolved: