From 6acf7c4225afa6e7cf95b142e36fb20823e02895 Mon Sep 17 00:00:00 2001
From: Nirothipan <nirothipan@gmail.com>
Date: Tue, 20 Jun 2017 11:12:31 +0530
Subject: [PATCH] edits in print messages in kilServer Method

---
 .../src/main/java/org.carbon.android.emulator/TryIt.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
index 440308b9e..0ed6007ed 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
@@ -761,12 +761,14 @@ public class TryIt {
         try {
             processKillServer = processBuilderKillServer.start();
         } catch (IOException ignored) {
-            // process works if restarted
+            System.out.println("If the device doesn't start properly, stop running the script and restart again");
         }
         try {
-            processKillServer.waitFor();
+            if (processKillServer != null) {
+                processKillServer.waitFor();
+            }
         } catch (InterruptedException ignored) {
-            // can be continued
+            System.out.println("If the device doesn't start properly, stop running the script and restart again");
         }
     }