modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java | 3 -- modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java | 13 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit 1242a7e054bf58f77abae4bae19936cade2775b0 Author: John Sanda jsanda@redhat.com Date: Tue Jan 29 14:59:27 2013 -0500
Revert "make sure test uses same jvm as maven and the rest of the build"
This reverts commit 043b1fd0123de94c6abab841b4beebd772e5fcca.
diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java index 53825d2..ee172ba 100644 --- a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java +++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java @@ -39,20 +39,22 @@ import java.util.HashSet; import java.util.List; import java.util.Set;
+import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.jmx.JMXDiscoveryComponent; +import org.rhq.plugins.jmx.util.JvmResourceKey; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test;
import org.rhq.core.clientapi.server.discovery.InventoryReport; -import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementReport; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceCategory; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.inventory.InventoryManager; @@ -63,8 +65,6 @@ import org.rhq.core.pc.util.InventoryPrinter; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.core.pluginapi.operation.OperationFacet; -import org.rhq.plugins.jmx.JMXDiscoveryComponent; -import org.rhq.plugins.jmx.util.JvmResourceKey;
/** * Integration test for the JMX plugin. @@ -125,8 +125,7 @@ public class JMXPluginTest { }
private Process startTestServerJvm(String... jvmArgs) throws IOException { -// String javaHome = System.getProperty("java.home"); - String javaHome = System.getenv("JAVA_HOME"); + String javaHome = System.getProperty("java.home"); String javaCmd = javaHome + "/bin/java";
List<String> args = new ArrayList<String>();
commit 476e22a6fbf8cb4dfcfc052ef6dec7f708196d57 Author: John Sanda jsanda@redhat.com Date: Tue Jan 29 14:58:45 2013 -0500
Revert "trying to work around NPE occurring in test"
This reverts commit 5b883624d1d85cb414dac1e5f7eea8a04ecaacfd.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java index 99f573f..1e1182f 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java @@ -104,8 +104,7 @@ public class JvmUtility { List<VirtualMachineDescriptor> vmDescriptors = VirtualMachine.list(); for (VirtualMachineDescriptor vmDescriptor : vmDescriptors) { if (Long.valueOf(vmDescriptor.id()) == process.getPid()) { -// String vmUserName = process.getCredentialsName().getUser(); - String vmUserName = process.freshSnapshot().getCredentialsName().getUser(); + String vmUserName = process.getCredentialsName().getUser(); String agentUserName = System.getProperty("user.name"); if (vmUserName.equals(agentUserName)) { LOG.debug("Attaching to JVM for java process with PID [" + process.getPid() + "]...");
rhq-commits@lists.fedorahosted.org