Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 773AE1825B for ; Thu, 30 Apr 2015 01:21:20 +0000 (UTC) Received: (qmail 74378 invoked by uid 500); 30 Apr 2015 01:21:20 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 74351 invoked by uid 500); 30 Apr 2015 01:21:20 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 74340 invoked by uid 99); 30 Apr 2015 01:21:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 01:21:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14F57E2F6F; Thu, 30 Apr 2015 01:21:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cordova-lib git commit: Fix NPE in PluginInfo.getKeywordsAndPlatforms when no keywords exist Date: Thu, 30 Apr 2015 01:21:19 +0000 (UTC) Repository: cordova-lib Updated Branches: refs/heads/master dbf54c3c8 -> c8f20a7c2 Fix NPE in PluginInfo.getKeywordsAndPlatforms when no keywords exist Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c8f20a7c Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c8f20a7c Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c8f20a7c Branch: refs/heads/master Commit: c8f20a7c2c4d35a329794d042140fa7feb384fcb Parents: dbf54c3 Author: Andrew Grieve Authored: Wed Apr 29 21:20:30 2015 -0400 Committer: Andrew Grieve Committed: Wed Apr 29 21:20:30 2015 -0400 ---------------------------------------------------------------------- cordova-lib/src/PluginInfo.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c8f20a7c/cordova-lib/src/PluginInfo.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/PluginInfo.js b/cordova-lib/src/PluginInfo.js index fe94682..a6ea7ce 100644 --- a/cordova-lib/src/PluginInfo.js +++ b/cordova-lib/src/PluginInfo.js @@ -334,7 +334,8 @@ function PluginInfo(dirname) { self.keywords = self.keywords.split(',').map( function(s) { return s.trim(); } ); } self.getKeywordsAndPlatforms = function () { - return self.keywords.concat('ecosystem:cordova').concat(addCordova(self.getPlatformsArray())); + var ret = self.keywords || []; + return ret.concat('ecosystem:cordova').concat(addCordova(self.getPlatformsArray())); }; } // End of PluginInfo constructor. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org