diff --git a/core/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java b/core/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java
index e097eff0c97dd..8ed3742ee7049 100644
--- a/core/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java
+++ b/core/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java
@@ -211,7 +211,7 @@ public static class SparkLauncherTestApp {
 
     public static void main(String[] args) throws Exception {
       assertEquals(1, args.length);
-      if("proc".equalsIgnoreCase(args[0])) {
+      if ("proc".equalsIgnoreCase(args[0])) {
         assertEquals("proc", args[0]);
         assertEquals("bar", System.getProperty("foo"));
       } else {
diff --git a/launcher/src/main/java/org/apache/spark/launcher/ChildThreadAppHandle.java b/launcher/src/main/java/org/apache/spark/launcher/ChildThreadAppHandle.java
index c44ed96e28fa9..792b33774060b 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/ChildThreadAppHandle.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/ChildThreadAppHandle.java
@@ -53,8 +53,8 @@ void setChildThread(Thread childThread) {
   }
 
   protected void waitFor() throws InterruptedException {
-    if(this.childThread.isAlive()) {
-      this.childThread.wait();
+    if (this.childThread.isAlive()) {
+      this.childThread.join();
     }
   }
 }