Refactoring: Fix null check.

Change-Id: I19f73bb308dfc54bca42079beb6189e18e9bafc3
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/common-project/src/org/tizen/emulator/manager/vms/helper/CheckingRunningEmulator.java b/common-project/src/org/tizen/emulator/manager/vms/helper/CheckingRunningEmulator.java
index befbfb6..48fd515 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/vms/helper/CheckingRunningEmulator.java
+++ b/common-project/src/org/tizen/emulator/manager/vms/helper/CheckingRunningEmulator.java
@@ -368,8 +368,10 @@ public class CheckingRunningEmulator {
                }
 
                private static void setVMExit(VMSocket vms) {
-                       if (vms.getProperty() != null && vms.getProperty().getWorker() != null) {
-                               vms.getProperty().getWorker().getLauncher().sendRemoteLog("stop");
+                       if (vms != null) {
+                               if (vms.getProperty() != null && vms.getProperty().getWorker() != null) {
+                                       vms.getProperty().getWorker().getLauncher().sendRemoteLog("stop");
+                               }
                        }
                        disconnect(vms);
                }
@@ -399,10 +401,10 @@ public class CheckingRunningEmulator {
                                                (path.equals(imagePath) || path.equals(swapImagePath)) ) {
                                        if (vms != null) {
                                                vms.setProperty(prop);
+                                               RefreshWorker.addToFinishedSet(vms.getEcs_port());
                                        }
                                        prop.setRunning(true);
                                        CheckingRunningEmulator.removeEmulator(prop);
-                                       RefreshWorker.addToFinishedSet(vms.getEcs_port());
 
                                        // this is not need for console mode
                                        Display.getDefault().asyncExec(new Runnable() {