Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-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 A0BE61733C for ; Thu, 5 Nov 2015 07:08:24 +0000 (UTC) Received: (qmail 39650 invoked by uid 500); 5 Nov 2015 07:08:24 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 39608 invoked by uid 500); 5 Nov 2015 07:08:24 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 39598 invoked by uid 99); 5 Nov 2015 07:08:24 -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, 05 Nov 2015 07:08:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70CEFE099B; Thu, 5 Nov 2015 07:08:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plusplusjiajia@apache.org To: commits@directory.apache.org Date: Thu, 05 Nov 2015 07:08:24 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/5] directory-kerby git commit: fix json backend problem that a new json backend database file will be created when new identities added Repository: directory-kerby Updated Branches: refs/heads/pkinit-support 4e7a3c0cf -> 87a9f55cf fix json backend problem that a new json backend database file will be created when new identities added Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/df2539be Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/df2539be Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/df2539be Branch: refs/heads/pkinit-support Commit: df2539bed1b4fc59642979ade83abfd8809b53bd Parents: ed68699 Author: yaningxu Authored: Wed Nov 4 18:29:18 2015 +0800 Committer: yaningxu Committed: Wed Nov 4 18:29:18 2015 +0800 ---------------------------------------------------------------------- .../kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/df2539be/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java ---------------------------------------------------------------------- diff --git a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java index 6139ef3..18a75c4 100644 --- a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java +++ b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java @@ -263,10 +263,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend { private void persistToFile() throws KrbException { String newJsonContent = gson.toJson(identities); try { - File newJsonKdbFile = File.createTempFile("kerby-kdb", - ".json", jsonKdbFile.getParentFile()); - IOUtil.writeFile(newJsonContent, newJsonKdbFile); - newJsonKdbFile.renameTo(jsonKdbFile); + IOUtil.writeFile(newJsonContent, jsonKdbFile); kdbFileUpdateTime = jsonKdbFile.lastModified(); } catch (IOException e) { LOG.error("Error occurred while writing identities to file: " + jsonKdbFile);