--- a/make/java/java/mapfile-vers	Mon Nov 10 16:55:55 2014 -0800
+++ b/make/java/java/mapfile-vers	Mon Nov 10 16:58:03 2014 -0800
@@ -275,7 +275,6 @@
 		Java_sun_misc_VM_latestUserDefinedLoader;
                 Java_sun_misc_VM_initialize;
 		Java_sun_misc_VMSupport_initAgentProperties;
-		Java_sun_misc_VMSupport_getVMTemporaryDirectory;
 
                 # ZipFile.c needs this one
 		throwFileNotFoundException;

--- a/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java	Mon Nov 10 16:55:55 2014 -0800
+++ b/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java	Mon Nov 10 16:58:03 2014 -0800
@@ -233,6 +233,8 @@
      *               does not conform to the expected pattern
      */
     public static int getLocalVmId(File file) {
+        int lvmid = 0;
+
         try {
             // try 1.4.2 and later format first
             return Integer.parseInt(file.getName());
@@ -285,13 +287,31 @@
         return tmpDirName + dirNamePrefix + user + File.separator;
     }
 
+    /*
+     * this static initializer would not be necessary if the
+     * Solaris java.io.tmpdir property were set to /tmp by default
+     */
     static {
         /*
-         * For this to work, the target VM and this code need to use
-         * the same directory. Instead of guessing which directory the
-         * VM is using, we will ask.
+         * Why is java.io.tmpdir on Solaris set to "/var/tmp/" when the
+         * HotSpot JVM os:get_temp_path() method returns "/tmp/"
+         *
+         * Why do Solaris and Windows return a string with a trailing
+         * file separator character where as Linix does not? (this change
+         * seems to have occurred sometime during hopper beta)
          */
-        String tmpdir = sun.misc.VMSupport.getVMTemporaryDirectory();
+        String tmpdir = System.getProperty("java.io.tmpdir");
+
+        if (tmpdir.compareTo("/var/tmp/") == 0) {
+             /*
+              * shared memory files are created in /tmp. Interestingly,
+              * java.io.tmpdir is set to "/var/tmp/" on Solaris and Linux,
+              * but os::get_temp_directory() is set to "/tmp/" on these
+              * platforms. the java.io.logging packages also makes reference
+              * to java.io.tmpdir.
+              */
+             tmpdir = "/tmp/";
+        }
 
         /*
          * Assure that the string returned has a trailing File.separator

--- a/src/share/classes/sun/misc/VMSupport.java	Mon Nov 10 16:55:55 2014 -0800
+++ b/src/share/classes/sun/misc/VMSupport.java	Mon Nov 10 16:58:03 2014 -0800
@@ -97,14 +97,4 @@
             throw new RuntimeException(ioe.getMessage());
         }
     }
-
-    /*
-     * Return the temporary directory that the VM uses for the attach
-     * and perf data files.
-     *
-     * It is important that this directory is well-known and the
-     * same for all VM instances. It cannot be affected by configuration
-     * variables such as java.io.tmpdir.
-     */
-    public static native String getVMTemporaryDirectory();
 }

--- a/src/share/javavm/export/jvm.h	Mon Nov 10 16:55:55 2014 -0800
+++ b/src/share/javavm/export/jvm.h	Mon Nov 10 16:58:03 2014 -0800
@@ -1320,9 +1320,6 @@
 JNIEXPORT jobject JNICALL
 JVM_InitAgentProperties(JNIEnv *env, jobject agent_props);
 
-JNIEXPORT jstring JNICALL
-JVM_GetTemporaryDirectory(JNIEnv *env);
-
 /* Generics reflection support.
  *
  * Returns information about the given class's EnclosingMethod

--- a/src/share/native/sun/misc/VMSupport.c	Mon Nov 10 16:55:55 2014 -0800
+++ b/src/share/native/sun/misc/VMSupport.c	Mon Nov 10 16:58:03 2014 -0800
@@ -53,9 +53,3 @@
     }
     return (*InitAgentProperties_fp)(env, props);
 }
-
-JNIEXPORT jstring JNICALL
-Java_sun_misc_VMSupport_getVMTemporaryDirectory(JNIEnv *env, jclass cls)
-{
-    return JVM_GetTemporaryDirectory(env);
-}

--- a/test/com/sun/tools/attach/BasicTests.java	Mon Nov 10 16:55:55 2014 -0800
+++ b/test/com/sun/tools/attach/BasicTests.java	Mon Nov 10 16:58:03 2014 -0800
@@ -38,7 +38,7 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
- * @run build Agent BadAgent RedefineAgent Application Shutdown RedefineDummy RunnerUtil
+ * @run build Agent BadAgent RedefineAgent Application Shutdown RedefineDummy
  * @run main BasicTests
  *
  * This test will perform a number of basic attach tests.
@@ -238,17 +238,19 @@
             // Test 6 - list method should list the target VM
             System.out.println(" - Test: VirtualMachine.list");
             List<VirtualMachineDescriptor> l = VirtualMachine.list();
-            boolean found = false;
-            for (VirtualMachineDescriptor vmd: l) {
-                if (vmd.id().equals(pid)) {
-                    found = true;
-                    break;
+            if (!l.isEmpty()) {
+                boolean found = false;
+                for (VirtualMachineDescriptor vmd: l) {
+                    if (vmd.id().equals(pid)) {
+                        found = true;
+                        break;
+                    }
                 }
-            }
-            if (found) {
-                System.out.println(" - " + pid + " found.");
-            } else {
-                throw new RuntimeException(pid + " not found in VM list");
+                if (found) {
+                    System.out.println(" - " + pid + " found.");
+                } else {
+                    throw new RuntimeException(pid + " not found in VM list");
+                }
             }
 
             // test 7 - basic hashCode/equals tests

--- a/test/com/sun/tools/attach/RunnerUtil.java	Mon Nov 10 16:55:55 2014 -0800
+++ b/test/com/sun/tools/attach/RunnerUtil.java	Mon Nov 10 16:58:03 2014 -0800
@@ -24,11 +24,12 @@
 import java.io.IOException;
 import java.io.File;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
-
 import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.JDKToolLauncher;
 import jdk.testlibrary.ProcessTools;
 import jdk.testlibrary.Utils;
 import jdk.testlibrary.ProcessThread;
@@ -38,7 +39,6 @@
  * (Test runner = class that launch a test)
  */
 public class RunnerUtil {
-
     /**
      * The Application process must be run concurrently with our tests since
      * the tests will attach to the Application.
@@ -49,31 +49,16 @@
      *
      * The Application will write its pid and shutdownPort in the given outFile.
      */
-    public static ProcessThread startApplication(String outFile, String... additionalOpts) throws Throwable {
+    public static ProcessThread startApplication(String outFile) throws Throwable {
         String classpath = System.getProperty("test.class.path", ".");
-        String[] myArgs = concat(additionalOpts, new String [] { "-Dattach.test=true", "-classpath", classpath, "Application", outFile });
-        String[] args = Utils.addTestJavaOpts(myArgs);
+        String[] args = Utils.addTestJavaOpts(
+            "-Dattach.test=true", "-classpath", classpath, "Application", outFile);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
         ProcessThread pt = new ProcessThread("runApplication", pb);
         pt.start();
         return pt;
     }
 
-    public static String[] concat(String[] a, String[] b) {
-        if (a == null) {
-            return b;
-        }
-        if (b == null) {
-            return a;
-        }
-        int aLen = a.length;
-        int bLen = b.length;
-        String[] c = new String[aLen + bLen];
-        System.arraycopy(a, 0, c, 0, aLen);
-        System.arraycopy(b, 0, c, aLen, bLen);
-        return c;
-     }
-
     /**
      * Will stop the running Application.
      * First tries to shutdown nicely by connecting to the shut down port.

--- a/test/com/sun/tools/attach/TempDirTest.java	Mon Nov 10 16:55:55 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.tools.attach.*;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Properties;
-import java.util.List;
-import java.io.File;
-
-import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.ProcessTools;
-import jdk.testlibrary.ProcessThread;
-
-/*
- * @test
- * @bug 8033104
- * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
- * @library /lib/testlibrary
- * @run build Application Shutdown RunnerUtil
- * @run main/timeout=10 TempDirTest
- */
-
-public class TempDirTest {
-
-    public static void main(String args[]) throws Throwable {
-
-        Path clientTmpDir = Files.createTempDirectory("TempDirTest-client");
-        clientTmpDir.toFile().deleteOnExit();
-        Path targetTmpDir = Files.createTempDirectory("TempDirTest-target");
-        targetTmpDir.toFile().deleteOnExit();
-
-        // run the test with all possible combinations of setting java.io.tmpdir
-        runExperiment(null, null);
-        runExperiment(clientTmpDir, null);
-        runExperiment(clientTmpDir, targetTmpDir);
-        runExperiment(null, targetTmpDir);
-
-    }
-
-    private static int counter = 0;
-
-    /*
-     * The actual test is in the nested class TestMain.
-     * The responsibility of this class is to:
-     * 1. Start the Application class in a separate process.
-     * 2. Find the pid and shutdown port of the running Application.
-     * 3. Launches the tests in nested class TestMain that will attach to the Application.
-     * 4. Shut down the Application.
-     */
-    public static void runExperiment(Path clientTmpDir, Path targetTmpDir) throws Throwable {
-
-        System.out.print("### Running tests with overridden tmpdir for");
-        System.out.print(" client: " + (clientTmpDir == null ? "no" : "yes"));
-        System.out.print(" target: " + (targetTmpDir == null ? "no" : "yes"));
-        System.out.println(" ###");
-
-        final String pidFile = "TempDirTest.Application.pid-" + counter++;
-        ProcessThread processThread = null;
-        RunnerUtil.ProcessInfo info = null;
-        try {
-            String[] tmpDirArg = null;
-            if (targetTmpDir != null) {
-                tmpDirArg = new String[] {"-Djava.io.tmpdir=" + targetTmpDir};
-            }
-            processThread = RunnerUtil.startApplication(pidFile, tmpDirArg);
-            info = RunnerUtil.readProcessInfo(pidFile);
-            launchTests(info.pid, clientTmpDir);
-        } catch (Throwable t) {
-            System.out.println("TempDirTest got unexpected exception: " + t);
-            t.printStackTrace();
-            throw t;
-        } finally {
-            // Make sure the Application process is stopped.
-            RunnerUtil.stopApplication(info.shutdownPort, processThread);
-        }
-    }
-
-    /**
-     * Runs the actual tests in nested class TestMain.
-     * The reason for running the tests in a separate process
-     * is that we need to modify the class path and
-     * the -Djava.io.tmpdir property.
-     */
-    private static void launchTests(int pid, Path clientTmpDir) throws Throwable {
-        final String sep = File.separator;
-
-        // Need to add jdk/lib/tools.jar to classpath.
-        String classpath =
-            System.getProperty("test.class.path", "") + File.pathSeparator +
-            System.getProperty("test.jdk", ".") + sep + "lib" + sep + "tools.jar";
-
-        String[] tmpDirArg = null;
-        if (clientTmpDir != null) {
-            tmpDirArg = new String [] {"-Djava.io.tmpdir=" + clientTmpDir};
-        }
-
-        // Arguments : [-Djava.io.tmpdir=] -classpath cp TempDirTest$TestMain pid
-        String[] args = RunnerUtil.concat(
-                tmpDirArg,
-                new String[] {
-                    "-classpath",
-                    classpath,
-                    "TempDirTest$TestMain",
-                    Integer.toString(pid) });
-        OutputAnalyzer output = ProcessTools.executeTestJvm(args);
-        output.shouldHaveExitValue(0);
-    }
-
-    /**
-     * This is the actual test. It will attach to the running Application
-     * and perform a number of basic attach tests.
-     */
-    public static class TestMain {
-        public static void main(String args[]) throws Exception {
-            String pid = args[0];
-
-            // Test 1 - list method should list the target VM
-            System.out.println(" - Test: VirtualMachine.list");
-            List<VirtualMachineDescriptor> l = VirtualMachine.list();
-            boolean found = false;
-            for (VirtualMachineDescriptor vmd: l) {
-                if (vmd.id().equals(pid)) {
-                    found = true;
-                    break;
-                }
-            }
-            if (found) {
-                System.out.println(" - " + pid + " found.");
-            } else {
-                throw new RuntimeException(pid + " not found in VM list");
-            }
-
-            // Test 2 - try to attach and verify connection
-
-            System.out.println(" - Attaching to application ...");
-            VirtualMachine vm = VirtualMachine.attach(pid);
-
-            System.out.println(" - Test: system properties in target VM");
-            Properties props = vm.getSystemProperties();
-            String value = props.getProperty("attach.test");
-            if (value == null || !value.equals("true")) {
-                throw new RuntimeException("attach.test property not set");
-            }
-            System.out.println(" - attach.test property set as expected");
-        }
-    }
-}

--- a/test/com/sun/tools/attach/java.policy.allow	Mon Nov 10 16:55:55 2014 -0800
+++ b/test/com/sun/tools/attach/java.policy.allow	Mon Nov 10 16:58:03 2014 -0800
@@ -13,6 +13,7 @@
     permission java.lang.RuntimePermission "accessClassInPackage.sun.jvmstat.monitor";
     permission java.lang.RuntimePermission "loadLibrary.attach";
     permission java.util.PropertyPermission "sun.jvmstat.*", "read";
+    permission java.util.PropertyPermission "java.io.tmpdir", "read";
 
     /* to read configuration file in META-INF/services, and write/delete .attach_pid<pid> */
     permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";

--- a/test/com/sun/tools/attach/java.policy.deny	Mon Nov 10 16:55:55 2014 -0800
+++ b/test/com/sun/tools/attach/java.policy.deny	Mon Nov 10 16:58:03 2014 -0800
@@ -11,6 +11,7 @@
     permission java.lang.RuntimePermission "accessClassInPackage.sun.tools.attach";
     permission java.lang.RuntimePermission "loadLibrary.attach";
     permission java.util.PropertyPermission "sun.jvmstat.*", "read";
+    permission java.util.PropertyPermission "java.io.tmpdir", "read";
 
     /* to read configuration file in META-INF/services, and write/delete .attach_pid<pid> */
     permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";