[INST] Remove coverity critical and major issues.

Change-Id: Ie8108d8dac044d2f593413ee09a9fd91c33a77b6
Signed-off-by: yongsung1.kim <yongsung1.kim@samsung.com>

diff --git a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
index 1231ce6..3c1b1de 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
+++ b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
@@ -147,7 +147,7 @@ public class InstallManager {
 
        private void initPackageManager(Collection<String> repositoryURLs) {
                File installedPackageListFile = null;
-               if (Registry.targetPath != "") {
+               if (Registry.targetPath.equalsIgnoreCase("")) {
                        installedPackageListFile = new File(PathUtil.get(
                                        PathUtil.get(Registry.targetPath, Config.INFO_DIRECTORY),
                                        Config.INSTALLED_PACKAGE_LIST_FILE_NAME));
@@ -578,14 +578,19 @@ public class InstallManager {
                        PathUtil.remove(fileDownloadTargetPath);
                        
                        String errMsg = "";
-                       if (monitor.isCanceled()) {
-                               errMsg = ErrorController.getErrorMessage();
+                       
+                       if (monitor != null) {
+                               if (monitor.isCanceled()) {
+                                       errMsg = ErrorController.getErrorMessage();
+                               } else {
+                                       errMsg = "Fail to get '" + 
+                                                       packageToDownload.getPackageName() + "'."  +
+                                                       "\n(" + ErrorController.getErrorMessage() + ")";
+                               }
+                               throw new IMFatalException(errMsg);                             
                        } else {
-                               errMsg = "Fail to get '" + 
-                                               packageToDownload.getPackageName() + "'."  +
-                                               "\n(" + ErrorController.getErrorMessage() + ")";
+                               Log.err("monitor is null.");
                        }
-                       throw new IMFatalException(errMsg);
                }
 
                if (Options.doPackageValidation) {

diff --git a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java
index 6af28b1..d747a79 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java
+++ b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java
@@ -374,7 +374,7 @@ public abstract class PackageManager {
                                        if (latestSnapshot == null) {
                                                return null;
                                        } else {
-                                               snapshotPath = DistributionController.getInstance().getLatestSnapshot(distribution).getPath();
+                                               snapshotPath = latestSnapshot.getPath();
                                        }
                                }
                                

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java
index fd6831f..9df3628 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java
@@ -606,7 +606,14 @@ public class ConfigurationDialog extends Dialog {
                                                        "There is not information for snapshot \'" + item.getText(TABLE_NAME) + "\'.",
                                                        DialogType.INFO, true);
                                } else {
-                                       snapshotDialog = new SnapshotLogDialog(getShell(), log, item.getText(TABLE_NAME));
+                                       String itemText = "";
+                                       if (item != null) {
+                                               itemText = item.getText(TABLE_NAME);
+                                       } else {
+                                               Log.err("Cannot display item text because item is null.");
+                                       }
+                                       snapshotDialog = new SnapshotLogDialog(getShell(), log, itemText);
+
                                        int ret = snapshotDialog.open();
                                        if (ret == 0) {
                                                Log.log("Success to open snapshot log dialog");

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
index 7a89a45..d2405ed 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
@@ -598,11 +598,16 @@ public class ViewController {
                rmPkgs = getRemovablePackageList();
                PackageSet insPkgs = getInstallableOrUpdatableMetaPackages();
                
-               if (!rmPkgs.isEmpty() || !insPkgs.isEmpty()) {
-                       Log.log("existInstallableOrRemovablePackages() is true.");
-                       return (getRemovablePackageList().size() > 0 || getInstallableOrUpdatableMetaPackages().size() > 0);                    
+               if (rmPkgs != null && insPkgs != null) {
+                       if (!rmPkgs.isEmpty() || !insPkgs.isEmpty()) {
+                               Log.log("existInstallableOrRemovablePackages() is true.");
+                               return (getRemovablePackageList().size() > 0 || getInstallableOrUpdatableMetaPackages().size() > 0);                    
+                       } else {
+                               Log.err("Both Removable Package List and Installable or Updatable Meta Packages are empty");                            
+                               return false;
+                       }                       
                } else {
-                       Log.err("Both Removable Package List and Installable or Updatable Meta Packages are null");                             
+                       Log.err("Both Removable Package List and Installable or Updatable Meta Packages are null");
                        return false;
                }
        }