Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-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 125E917800 for ; Wed, 22 Apr 2015 13:58:31 +0000 (UTC) Received: (qmail 89300 invoked by uid 500); 22 Apr 2015 13:57:56 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 89265 invoked by uid 500); 22 Apr 2015 13:57:56 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 89255 invoked by uid 99); 22 Apr 2015 13:57:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 13:57:56 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 13:57:51 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id E415A24BA8 for ; Wed, 22 Apr 2015 13:57:30 +0000 (UTC) Received: (qmail 89051 invoked by uid 99); 22 Apr 2015 13:57:30 -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; Wed, 22 Apr 2015 13:57:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7932FE1083; Wed, 22 Apr 2015 13:57:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markap14@apache.org To: commits@nifi.incubator.apache.org Date: Wed, 22 Apr 2015 13:57:34 -0000 Message-Id: <9cedb36e9f8b49ffaeef4c899d9ba411@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/7] incubator-nifi git commit: NIFI-527: Cleaned up log messages X-Virus-Checked: Checked by ClamAV on apache.org NIFI-527: Cleaned up log messages Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2f7b2ef3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2f7b2ef3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2f7b2ef3 Branch: refs/heads/improve-prov-performance Commit: 2f7b2ef30091334d40655485d147aa1a571fd6b9 Parents: 9a9973a Author: Mark Payne Authored: Tue Apr 21 10:54:33 2015 -0400 Committer: Mark Payne Committed: Tue Apr 21 10:54:33 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/provenance/lucene/IndexManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2f7b2ef3/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java index 0d93f3b..3943504 100644 --- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java +++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java @@ -141,7 +141,8 @@ public class IndexManager implements Closeable { try { if ( count == null ) { - logger.warn("Index Writer {} was returned to IndexManager for {}, but this writer is not known. This could potentially lead to a resource leak", writer, indexingDirectory); + logger.warn("Index Writer {} was returned to IndexManager for {}, but this writer is not known. " + + "This could potentially lead to a resource leak", writer, indexingDirectory); writer.close(); } else if ( count.getCount() <= 1 ) { // we are finished with this writer. @@ -185,10 +186,9 @@ public class IndexManager implements Closeable { if ( searcher.isCache() ) { final int refCount = searcher.getSearcher().getIndexReader().getRefCount(); if ( refCount <= 0 ) { - // if refCount == 0, then the reader has been closed, so we need to discard the - // searcher. - logger.debug("Reference count for cached Index Searcher {} is currently {}; " - + "removing cached searcher", searcher.getSearcher().getIndexReader(), refCount); + // if refCount == 0, then the reader has been closed, so we need to discard the searcher + logger.debug("Reference count for cached Index Searcher for {} is currently {}; " + + "removing cached searcher", absoluteFile, refCount); expired.add(searcher); continue; }