Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75B78DB2C for ; Thu, 7 Feb 2013 05:40:56 +0000 (UTC) Received: (qmail 98043 invoked by uid 500); 7 Feb 2013 05:40:56 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 98015 invoked by uid 500); 7 Feb 2013 05:40:55 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 97996 invoked by uid 99); 7 Feb 2013 05:40:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 05:40:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EC3362494E; Thu, 7 Feb 2013 05:40:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: refs/heads/4.1 - CLOUDSTACK-1181: Fix NPE, ignore if default path is not readable, we're passing props file anyway Message-Id: <20130207054054.EC3362494E@tyr.zones.apache.org> Date: Thu, 7 Feb 2013 05:40:54 +0000 (UTC) Updated Branches: refs/heads/4.1 6db11cb7d -> f95b0edaf CLOUDSTACK-1181: Fix NPE, ignore if default path is not readable, we're passing props file anyway Signed-off-by: Rohit Yadav (cherry picked from commit 7c003611d04d10bae2f02f3f3b9338e166b75676) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f95b0eda Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f95b0eda Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f95b0eda Branch: refs/heads/4.1 Commit: f95b0edaff79d38c1a46402df6ef1b650bf58f6b Parents: 6db11cb Author: Rohit Yadav Authored: Thu Feb 7 11:08:28 2013 +0530 Committer: Rohit Yadav Committed: Thu Feb 7 11:10:37 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/upgrade/DatabaseCreator.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f95b0eda/server/src/com/cloud/upgrade/DatabaseCreator.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/upgrade/DatabaseCreator.java b/server/src/com/cloud/upgrade/DatabaseCreator.java index 99e63a6..4d70634 100755 --- a/server/src/com/cloud/upgrade/DatabaseCreator.java +++ b/server/src/com/cloud/upgrade/DatabaseCreator.java @@ -156,7 +156,10 @@ public class DatabaseCreator { System.exit(1); } - Transaction.initDataSource(dbPropsFile); + try { + Transaction.initDataSource(dbPropsFile); + } catch (NullPointerException e) { + } initDB(dbPropsFile, rootPassword, databases, dryRun); // Process sql files