[INST] Modify null return check

Change-Id: I67745f902bf6997d2059bb42ae30878bfa4fd3e8
Signed-off-by: Moonkyu Kang <moonkyu82.kang@samsung.com>

diff --git a/InstallManager_java/src/org/tizen/installmanager/cli/CliUnzipImage.java b/InstallManager_java/src/org/tizen/installmanager/cli/CliUnzipImage.java
index ccf487f..97e0d8a 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/cli/CliUnzipImage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/cli/CliUnzipImage.java
@@ -154,7 +154,7 @@ public class CliUnzipImage {
                                } else { // File case
                                        File parent = PathUtil.makeParent(targetFile.getAbsolutePath());
                                        
-                                       if (!parent.getAbsolutePath().equalsIgnoreCase(sdkTempDir)) {
+                                       if (parent != null && !parent.getAbsolutePath().equalsIgnoreCase(sdkTempDir)) {
                                                cnt = PathUtil.getParentCnt(fileNameToUnzip);                                           
                                        }
                                        if (0 > UnzipUtil.unzipEntry(zis, targetFile)) {

diff --git a/InstallManager_java/src/org/tizen/installmanager/cli/InstallManagerNoUI.java b/InstallManager_java/src/org/tizen/installmanager/cli/InstallManagerNoUI.java
index a207469..d1c1cfb 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/cli/InstallManagerNoUI.java
+++ b/InstallManager_java/src/org/tizen/installmanager/cli/InstallManagerNoUI.java
@@ -76,7 +76,7 @@ public class InstallManagerNoUI {
                        unzipSDKImage();
                }
                
-               if (Registry.getInstalledPath() != "") {
+               if (Registry.getInstalledPath() != null && !Registry.getInstalledPath().equals("")) {
                        List<String> all = new ArrayList<String>();
                        all.add("all");
                        if (cliUninstall(all)) {
@@ -128,7 +128,7 @@ public class InstallManagerNoUI {
        }
        
        public static boolean cliNetworkInstall(List<String> packageNames) throws IMExitException {
-               if (Registry.getInstalledPath() != "") {
+               if (Registry.getInstalledPath() != null && !Registry.getInstalledPath().equals("") ) {
                        String installRepo = Config.getInstance().getConfigFile().getRepository();
                        String installDist = Config.getInstance().getConfigFile().getDistribution();
                        String remoteRepo = Options.repository;
@@ -172,7 +172,7 @@ public class InstallManagerNoUI {
        }
        
        public static boolean cliUninstall(List<String> packageNames) throws IMExitException {
-               if (Registry.getInstalledPath() == "") {
+               if (Registry.getInstalledPath() != null && Registry.getInstalledPath().equals("")) {
                        System.out.println("Tizen SDK was not installed.");
                        return false;
                } else {