From e36ece644661515ecdbaabc8f9d44d98ed373850 Mon Sep 17 00:00:00 2001 From: "jihye424.kim" Date: Thu, 3 Dec 2015 11:21:50 +0900 Subject: [PATCH] vm property: fix null pointer exception - bug: if child image path or sawp image path is null, throw null pointer exception - fix: check this value is null or not Change-Id: Ifdfc961b7181bccb0e73d8308fdf66840c9d84fb Signed-off-by: jihye424.kim (cherry picked from commit 7c5053aca892e2c82088a9ac89223fc8ca9316b8) --- src/org/tizen/emulator/manager/vms/VMPropertyConfiguration.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/tizen/emulator/manager/vms/VMPropertyConfiguration.java b/src/org/tizen/emulator/manager/vms/VMPropertyConfiguration.java index f4ff8d1..ee43ff3 100644 --- a/src/org/tizen/emulator/manager/vms/VMPropertyConfiguration.java +++ b/src/org/tizen/emulator/manager/vms/VMPropertyConfiguration.java @@ -174,7 +174,9 @@ public class VMPropertyConfiguration { public String getChildImagePath() { if(configuration == null - || configuration.getBaseInformation() == null || configuration.getBaseInformation().getDiskImage() == null) { + || configuration.getBaseInformation() == null + || configuration.getBaseInformation().getDiskImage() == null + || configuration.getBaseInformation().getDiskImage().getCurrentDiskImage() == null) { return ""; //$NON-NLS-1$ } @@ -183,7 +185,9 @@ public class VMPropertyConfiguration { public String getSwapImagePath() { if(configuration == null - || configuration.getBaseInformation() == null || configuration.getBaseInformation().getDiskImage() == null) { + || configuration.getBaseInformation() == null + || configuration.getBaseInformation().getDiskImage() == null + || configuration.getBaseInformation().getDiskImage().getSwapDiskImage() == null) { return ""; //$NON-NLS-1$ } -- 2.7.4