Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 271EB200C29 for ; Tue, 28 Feb 2017 12:23:50 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 25B76160B6A; Tue, 28 Feb 2017 11:23:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 73482160B7C for ; Tue, 28 Feb 2017 12:23:49 +0100 (CET) Received: (qmail 2542 invoked by uid 500); 28 Feb 2017 11:06:08 -0000 Mailing-List: contact commits-help@ranger.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.apache.org Delivered-To: mailing list commits@ranger.apache.org Received: (qmail 1271 invoked by uid 99); 28 Feb 2017 11:04:31 -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; Tue, 28 Feb 2017 11:04:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 193EDDF9AF; Tue, 28 Feb 2017 11:04:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@ranger.apache.org Date: Tue, 28 Feb 2017 11:04:31 -0000 Message-Id: In-Reply-To: <3a132b69bab346af9703fdb20c01348e@git.apache.org> References: <3a132b69bab346af9703fdb20c01348e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ranger git commit: RANGER-1403:There is a problem in buildks class when delete invalid keystore file. archived-at: Tue, 28 Feb 2017 11:23:50 -0000 RANGER-1403:There is a problem in buildks class when delete invalid keystore file. Signed-off-by: Colm O hEigeartaigh Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8cb01118 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8cb01118 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8cb01118 Branch: refs/heads/master Commit: 8cb01118573e0778a627e67673c39ddd1b619621 Parents: 674cab3 Author: zhangqiang2 Authored: Wed Feb 22 02:11:15 2017 -0500 Committer: Colm O hEigeartaigh Committed: Tue Feb 28 10:58:57 2017 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/ranger/credentialapi/buildks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/8cb01118/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java ---------------------------------------------------------------------- diff --git a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java index 7978d8d..a7e433f 100644 --- a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java +++ b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java @@ -535,7 +535,7 @@ public class buildks { } if(keystore!=null && !keystore.isEmpty()){ File file =new File(keystore); - if(file!=null && file.length()==0){ + if(file!=null && file.exists() && file.length()==0){ System.out.println("Provider file '"+keystore+"' is in invalid state or corrupt!! will try to delete first."); file.delete(); file=null;