[jbosstools-issues] [JBoss JIRA] (JBIDE-17798) compile failure in jbosstools-server

[Daniel Azarov (JIRA)]

Daniel Azarov created JBIDE-17798:
-------------------------------------

             Summary: compile failure in jbosstools-server
                 Key: JBIDE-17798
                 URL: https://issues.jboss.org/browse/JBIDE-17798
             Project: Tools (JBoss Tools)
          Issue Type: Bug
          Components: server
    Affects Versions: 4.2.0.Beta3
            Reporter: Daniel Azarov
            Priority: Blocker


org.jboss.tools.jmx.jvmmonitor.internal.core.cpu.CpuProfiler

{code}
    /*
     * @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;
    }
{code}



--
This message was sent by Atlassian JIRA
(v6.2.6#6264)