From 13a51887f79b1d139db448b95c16b7df3c70f2e5 Mon Sep 17 00:00:00 2001 From: Staffan Larsen Date: Mon, 8 Sep 2014 14:46:51 +0200 Subject: [PATCH] 8057776: Misc cleanups of the attach code Reviewed-by: alanb, dfuchs, jbachorik --- .../classes/sun/tools/attach/AttachProviderImpl.java | 5 ----- .../classes/sun/tools/attach/AttachProviderImpl.java | 5 ----- .../classes/com/sun/tools/attach/VirtualMachine.java | 4 ++-- .../classes/sun/tools/attach/HotSpotAttachProvider.java | 9 --------- .../classes/sun/tools/attach/AttachProviderImpl.java | 1 - .../management/jmxremote/startstop/JMXStartStopTest.java | 3 +-- 6 files changed, 3 insertions(+), 24 deletions(-) diff --git a/jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java b/jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java index adf8b01e6b4..fd89af02511 100644 --- a/jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java +++ b/jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java @@ -27,8 +27,6 @@ package sun.tools.attach; import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; import com.sun.tools.attach.AttachNotSupportedException; -import com.sun.tools.attach.spi.AttachProvider; - import java.io.IOException; /* @@ -37,9 +35,6 @@ import java.io.IOException; */ public class AttachProviderImpl extends HotSpotAttachProvider { - // perf counter for the JVM version - private static final String JVM_VERSION = "java.property.java.vm.version"; - public AttachProviderImpl() { } diff --git a/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java b/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java index 0f129769c0e..d44684f81af 100644 --- a/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java +++ b/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java @@ -27,8 +27,6 @@ package sun.tools.attach; import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; import com.sun.tools.attach.AttachNotSupportedException; -import com.sun.tools.attach.spi.AttachProvider; - import java.io.IOException; /* @@ -37,9 +35,6 @@ import java.io.IOException; */ public class AttachProviderImpl extends HotSpotAttachProvider { - // perf counter for the JVM version - private static final String JVM_VERSION = "java.property.java.vm.version"; - public AttachProviderImpl() { } diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java index e735c2c775f..d5e934a6e2d 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java @@ -636,7 +636,7 @@ public abstract class VirtualMachine { * @throws NullPointerException * If agentProperties is null. * - * @since 1.9 + * @since 1.8 */ public abstract void startManagementAgent(Properties agentProperties) throws IOException; @@ -662,7 +662,7 @@ public abstract class VirtualMachine { * that cannot be identified as an error to indicate that the * operation failed in the target VM. * - * @since 1.9 + * @since 1.8 */ public abstract String startLocalManagementAgent() throws IOException; diff --git a/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java b/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java index c28dddad9d7..95faea9429e 100644 --- a/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java +++ b/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java @@ -25,34 +25,25 @@ package sun.tools.attach; import com.sun.tools.attach.VirtualMachineDescriptor; -import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.AttachPermission; import com.sun.tools.attach.AttachNotSupportedException; import com.sun.tools.attach.spi.AttachProvider; -import java.io.IOException; import java.util.List; -import java.util.Iterator; import java.util.ArrayList; import java.util.Set; -import java.net.URISyntaxException; import sun.jvmstat.monitor.HostIdentifier; -import sun.jvmstat.monitor.Monitor; import sun.jvmstat.monitor.MonitoredHost; import sun.jvmstat.monitor.MonitoredVm; import sun.jvmstat.monitor.MonitoredVmUtil; import sun.jvmstat.monitor.VmIdentifier; -import sun.jvmstat.monitor.MonitorException; /* * Platform specific provider implementations extend this */ public abstract class HotSpotAttachProvider extends AttachProvider { - // perf count name for the JVM version - private static final String JVM_VERSION = "java.property.java.vm.version"; - public HotSpotAttachProvider() { } diff --git a/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java b/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java index b044bb6965f..df0d8dc248e 100644 --- a/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java +++ b/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java @@ -27,7 +27,6 @@ package sun.tools.attach; import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; import com.sun.tools.attach.AttachNotSupportedException; -import com.sun.tools.attach.spi.AttachProvider; import java.io.IOException; /* diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java index 98009708869..6d142174f6b 100644 --- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java +++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java @@ -115,8 +115,7 @@ public class JMXStartStopTest { throws Exception { Set names = server.queryNames(pattern,query); - for (Iterator i = names.iterator(); i.hasNext(); ) { - ObjectName name = (ObjectName)i.next(); + for (ObjectName name : names) { MBeanInfo info = server.getMBeanInfo(name); dbg_print("Got MBean: " + name);