--- a/jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java	Sun Sep 07 23:04:09 2014 +0400
+++ b/jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java	Mon Sep 08 14:46:51 2014 +0200
@@ -27,8 +27,6 @@
 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 @@
  */
 public class AttachProviderImpl extends HotSpotAttachProvider {
 
-    // perf counter for the JVM version
-    private static final String JVM_VERSION = "java.property.java.vm.version";
-
     public AttachProviderImpl() {
     }
 

--- a/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java	Sun Sep 07 23:04:09 2014 +0400
+++ b/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java	Mon Sep 08 14:46:51 2014 +0200
@@ -27,8 +27,6 @@
 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 @@
  */
 public class AttachProviderImpl extends HotSpotAttachProvider {
 
-    // perf counter for the JVM version
-    private static final String JVM_VERSION = "java.property.java.vm.version";
-
     public AttachProviderImpl() {
     }
 

--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java	Sun Sep 07 23:04:09 2014 +0400
+++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java	Mon Sep 08 14:46:51 2014 +0200
@@ -636,7 +636,7 @@
      * @throws  NullPointerException
      *          If agentProperties is null.
      *
-     * @since   1.9
+     * @since   1.8
      */
     public abstract void startManagementAgent(Properties agentProperties) throws IOException;
 
@@ -662,7 +662,7 @@
      *          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;
 

--- a/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java	Sun Sep 07 23:04:09 2014 +0400
+++ b/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java	Mon Sep 08 14:46:51 2014 +0200
@@ -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() {
     }
 

--- a/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java	Sun Sep 07 23:04:09 2014 +0400
+++ b/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java	Mon Sep 08 14:46:51 2014 +0200
@@ -27,7 +27,6 @@
 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;
 
 /*

--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java	Sun Sep 07 23:04:09 2014 +0400
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java	Mon Sep 08 14:46:51 2014 +0200
@@ -115,8 +115,7 @@
     throws Exception {
 
         Set<ObjectName> names = server.queryNames(pattern,query);
-        for (Iterator<ObjectName> i = names.iterator(); i.hasNext(); ) {
-            ObjectName name = (ObjectName)i.next();
+        for (ObjectName name : names) {
             MBeanInfo info = server.getMBeanInfo(name);
             dbg_print("Got MBean: " + name);