From 77452f02a603a2337c1ef607729c99bba0c6b651 Mon Sep 17 00:00:00 2001 From: Jihoon Song Date: Mon, 1 Jul 2013 16:13:42 +0900 Subject: [PATCH] [Title] cli: fixed NPE for profile converting [Desc.] [Issue] Change-Id: I8da7146c18478006490962ad22c9664877f553fe --- org.tizen.cli/build.properties | 2 -- org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/org.tizen.cli/build.properties b/org.tizen.cli/build.properties index b7d31b9..1d3c4b0 100644 --- a/org.tizen.cli/build.properties +++ b/org.tizen.cli/build.properties @@ -6,8 +6,6 @@ bin.includes = META-INF/,\ about_files/,\ about.html,\ OSGI-INF/ -source.lib/commons-cli-1.2.jar = jars.compile.order = .,\ lib/commons-cli-1.2.jar,\ lib/ant.jar -source.lib/ant.jar = diff --git a/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java b/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java index 9c041cb..b983889 100644 --- a/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java @@ -274,8 +274,7 @@ extends AbstractLauncher // notify items of selected profile for ( int i = 0; i <= SigningProfile.MAX_DISTRIBUTOR; i++ ) { SigningProfileItem item = profile.getProfileItem( i ); - String keyLocation = item.getKeyLocation(); - if ( ! StringUtil.isEmpty( keyLocation ) ) { + if ( ( item != null ) && ( ! StringUtil.isEmpty( item.getKeyLocation() ) ) ) { String msg = ( i == SigningProfile.AUTHOR_ORDINAL ) ? "Author certficate: " : "Distributor" + i + " certificate : "; getPrompter().notify( msg + item.getKeyLocation() ); } -- 2.7.4