--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/tools/jstat/JStatInterval.java	Fri Feb 28 15:39:15 2014 +0100
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8035668
+ * @library /lib/testlibrary
+ * @summary Test checks case when target application finishes execution and jstat didn't complete work.
+            jstat is started with interval = 100 (jstat -compiler 100) and monitored application finishes
+            after 500ms. This shouldn't cause crash or hang in target application or in jstat.
+ * @build jdk.testlibrary.ProcessTools jdk.testlibrary.JDKToolLauncher
+ * @build JStatInterval
+ * @run main JStatInterval
+ */
+
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.JDKToolLauncher;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class JStatInterval {
+    private static final String PID = "PID";
+    private static final String READY = "READY";
+    private static final String ERROR = "!ERROR";
+
+    public static class Application {
+        public static void main(String[] args) {
+            try {
+                System.out.println(PID + ":" + ProcessTools.getProcessId());
+                System.out.println(READY);
+                System.out.flush();
+                int exitCode = System.in.read();
+                Thread.sleep(500);
+                System.exit(exitCode);
+            } catch (Exception e) {
+                System.out.println(ERROR);
+                System.out.flush();
+                throw new Error(e);
+            }
+        }
+    }
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-cp",
+            System.getProperty("test.class.path"),
+            "-XX:+UsePerfData",
+            Application.class.getName()
+        );
+        AtomicInteger pid = new AtomicInteger(-1);
+        AtomicBoolean error = new AtomicBoolean(false);
+        Process app = ProcessTools.startProcess(
+            "application",
+            pb,
+            line -> {
+                if (line.startsWith(PID)) {
+                    pid.set(Integer.parseInt(line.split("\\:")[1]));
+                } else if (line.equals(READY)) {
+                    return true;
+                } else if (line.equals(ERROR)) {
+                    error.set(true);
+                    return true;
+                }
+                return false;
+            },
+            10,
+            TimeUnit.SECONDS
+        );
+        if (error.get()) {
+            throw new Error("Unable to start the monitored application.");
+        }
+
+        String pidStr = String.valueOf(pid.get());
+        JDKToolLauncher l = JDKToolLauncher.createUsingTestJDK("jstat");
+        l.addToolArg("-compiler");
+        l.addToolArg(pidStr);
+        l.addToolArg("100");
+
+        ProcessBuilder jstatDef = new ProcessBuilder(l.getCommand());
+        Process jstat = ProcessTools.startProcess(
+            "jstat",
+            jstatDef,
+            line -> {
+                if (line.trim().toLowerCase().startsWith("compiled")) {
+                    return true;
+                }
+                return false;
+            },
+            10,
+            TimeUnit.SECONDS
+        );
+
+        app.getOutputStream().write(0);
+        app.getOutputStream().flush();
+
+        if (app.waitFor() != 0) {
+            throw new Error("Error detected upon exiting the monitored application with active jstat");
+        }
+        if (jstat.waitFor() != 0) {
+            throw new Error("Error detected in jstat when monitored application has exited prematurely");
+        }
+    }
+}