From 3cb0659ca0f818f25b918df50ab2ea08c08efe21 Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Fri, 29 Aug 2014 13:49:06 +0900 Subject: [PATCH] Refactoring: Fix null check. Change-Id: I19f73bb308dfc54bca42079beb6189e18e9bafc3 Signed-off-by: minkee.lee --- .../emulator/manager/vms/helper/CheckingRunningEmulator.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 --- 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() { -- 2.7.4