MISC: Resolved dereference null return value

Change-Id: Icfb09532ccfa1eb7e377de7308c6ed039123f06c
Signed-off-by: donghyuk.yang <donghyuk.yang@samsung.com>

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java
index e1b2aeb..e97da7b 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java
@@ -830,6 +830,9 @@ public class PlatformLaunchDelegate extends AbstractCLaunchDelegate {
 
     protected IPath getHostPath(String exePath, ILaunchConfiguration config) throws CoreException {
         IPath path = target.getRootstrap().getPath();
+        if (target.getRootstrapCommander() == null) {
+            return new Path(exePath);
+        }
         String canonicalPath = target.getRootstrapCommander().canonicalizePath(exePath);
         String rootstrapPath = SmartBuildInterface.getInstance().getPlatformRootstrapPath(path);
         if (rootstrapPath != null && !rootstrapPath.isEmpty()) {

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingPage.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingPage.java
index 2d27dd7..68821a0 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingPage.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingPage.java
@@ -245,6 +245,9 @@ public class PlatformLaunchSettingPage extends PlatformLaunchCommonPage {
         }
         if (mode.equals(ILaunchManager.DEBUG_MODE)) {
             final IPkgCommander rootstrapCommander = cmdTarget.getRootstrapCommander();
+            if (rootstrapCommander == null) {
+                return;
+            }
             findDebugPkg = true;
             IWizardContainer container = getContainer();
             try {

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/EnvironmentDialog.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/EnvironmentDialog.java
index bd5326e..08b758d 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/EnvironmentDialog.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/EnvironmentDialog.java
@@ -453,7 +453,7 @@ public class EnvironmentDialog extends Dialog {
     /**
      * Content provider for the environment table
      */
-    protected class EnvironmentVariableContentProvider implements IStructuredContentProvider {
+    private static class EnvironmentVariableContentProvider implements IStructuredContentProvider {
         public Object[] getElements(Object inputElement) {
             EnvironmentVariable[] elements = new EnvironmentVariable[0];
             Map m = (Map) inputElement;