# HG changeset patch
# User dsamersoff
# Date 1435057232 0
# Node ID b2b399eeb3b1b92a83461f3a0f6f6729894e8a4c
# Parent  3d93d020e9af7a77bf13a32cb0c681003208b0f3# Parent  8ece48927ac007ef4fcada22a9c736a463c9c976
Merge

diff -r 3d93d020e9af -r b2b399eeb3b1 hotspot/test/serviceability/sa/TestClassLoaderStats.java
--- a/hotspot/test/serviceability/sa/TestClassLoaderStats.java	Tue Jun 23 10:12:44 2015 +0200
+++ b/hotspot/test/serviceability/sa/TestClassLoaderStats.java	Tue Jun 23 11:00:32 2015 +0000
@@ -68,7 +68,7 @@
             output.stderrShouldNotMatch("[E|e]xception");
             output.stderrShouldNotMatch("[E|e]rror");
         } finally {
-            app.stopApp();
+            LingeredApp.stopApp(app);
         }
     }
 
diff -r 3d93d020e9af -r b2b399eeb3b1 hotspot/test/serviceability/sa/TestStackTrace.java
--- a/hotspot/test/serviceability/sa/TestStackTrace.java	Tue Jun 23 10:12:44 2015 +0200
+++ b/hotspot/test/serviceability/sa/TestStackTrace.java	Tue Jun 23 11:00:32 2015 +0000
@@ -66,7 +66,7 @@
             output.stderrShouldNotMatch("[E|e]xception");
             output.stderrShouldNotMatch("[E|e]rror");
         } finally {
-            app.stopApp();
+            LingeredApp.stopApp(app);
         }
      }