MISC: UTIL: Fixed NPE.(prevent)

Fixed NPE in ProjectUtil class.

Change-Id: I23f50c8e935eee435a3f9bb1552255eb1bdad01a
Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com>

diff --git a/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonWizardPage.java b/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonWizardPage.java
index 37209c3..ebf7881 100644 (file)
--- a/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonWizardPage.java
+++ b/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonWizardPage.java
@@ -26,6 +26,7 @@
 package org.tizen.common.ui.wizards;
 
 import java.io.File;
+import java.net.URI;
 import java.util.HashMap;
 
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -134,7 +135,12 @@ public class TizenCommonWizardPage extends WizardNewProjectCreationPage {
             return false;
         }
 
-        String errorMsg = ProjectValidationUtil.getValidatedMsgAboutLocation(getProjectName(), getLocationURI());
+        URI locationUri = getLocationURI();
+        if (locationUri == null) {
+            return false;
+        }
+
+        String errorMsg = ProjectValidationUtil.getValidatedMsgAboutLocation(getProjectName(), locationUri);
         if (!errorMsg.isEmpty()) {
             this.setErrorMessage(errorMsg);
             return false;

diff --git a/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java b/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java
index 61a6d17..7e406dc 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java
+++ b/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java
@@ -224,7 +224,11 @@ public class ProjectUtil {
         if(descriptionLocation.segmentCount() < 2) {
             return false;
         }
-        return descriptionLocation.removeLastSegments(2).toFile().equals(Platform.getLocation().toFile());
+        IPath location = Platform.getLocation();
+        if (location == null) {
+            return false;
+        }
+        return descriptionLocation.removeLastSegments(2).toFile().equals(location.toFile());
     }
 
     /**