Return-Path: X-Original-To: apmail-lucene-dev-archive@www.apache.org Delivered-To: apmail-lucene-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D727D9E4E for ; Fri, 2 Dec 2011 21:13:44 +0000 (UTC) Received: (qmail 19454 invoked by uid 500); 2 Dec 2011 21:13:43 -0000 Delivered-To: apmail-lucene-dev-archive@lucene.apache.org Received: (qmail 19377 invoked by uid 500); 2 Dec 2011 21:13:43 -0000 Mailing-List: contact dev-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list dev@lucene.apache.org Received: (qmail 19370 invoked by uid 99); 2 Dec 2011 21:13:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 21:13:43 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [74.125.82.48] (HELO mail-ww0-f48.google.com) (74.125.82.48) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 21:13:37 +0000 Received: by wgbdt12 with SMTP id dt12so1255365wgb.5 for ; Fri, 02 Dec 2011 13:13:17 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.80.83 with SMTP id j61mr874709wee.40.1322860361982; Fri, 02 Dec 2011 13:12:41 -0800 (PST) Received: by 10.216.183.84 with HTTP; Fri, 2 Dec 2011 13:12:41 -0800 (PST) In-Reply-To: <000001ccb136$4ee78d90$ecb6a8b0$@thetaphi.de> References: <20111202195254.BD7B82388A9B@eris.apache.org> <000001ccb136$4ee78d90$ecb6a8b0$@thetaphi.de> Date: Fri, 2 Dec 2011 16:12:41 -0500 Message-ID: Subject: Re: svn commit: r1209663 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java From: Michael McCandless To: dev@lucene.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org No problem! Par for the course... Mike McCandless http://blog.mikemccandless.com On Fri, Dec 2, 2011 at 4:06 PM, Uwe Schindler wrote: > Sorry! > > ----- > Uwe Schindler > H.-H.-Meier-Allee 63, D-28213 Bremen > http://www.thetaphi.de > eMail: uwe@thetaphi.de > >> -----Original Message----- >> From: mikemccand@apache.org [mailto:mikemccand@apache.org] >> Sent: Friday, December 02, 2011 8:53 PM >> To: commits@lucene.apache.org >> Subject: svn commit: r1209663 - >> /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.ja= va >> >> Author: mikemccand >> Date: Fri Dec =A02 19:52:39 2011 >> New Revision: 1209663 >> >> URL: http://svn.apache.org/viewvc?rev=3D1209663&view=3Drev >> Log: >> LUCENE-3598: fix some accidental behaviour changes here... >> >> Modified: >> >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.jav= a >> >> Modified: >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.jav= a >> URL: >> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache= /lu >> cene/index/IndexWriter.java?rev=3D1209663&r1=3D1209662&r2=3D1209663&view= =3Ddi >> ff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.jav= a >> (original) >> +++ >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.jav= a >> Fri Dec =A02 19:52:39 2011 >> @@ -371,7 +371,9 @@ public class IndexWriter implements Clos >> =A0 =A0 =A0 =A0 =A0// never reached but javac disagrees: >> =A0 =A0 =A0 =A0 =A0return null; >> =A0 =A0 =A0 =A0} finally { >> - =A0 =A0 =A0 =A0infoStream.message("IW", "hit exception during NRT read= er"); >> + =A0 =A0 =A0 =A0if (!success && infoStream.isEnabled("IW")) { >> + =A0 =A0 =A0 =A0 =A0infoStream.message("IW", "hit exception during NRT = reader"); >> + =A0 =A0 =A0 =A0} >> =A0 =A0 =A0 =A0 =A0// Done: finish the full flush! >> =A0 =A0 =A0 =A0 =A0docWriter.finishFullFlush(success); >> =A0 =A0 =A0 =A0 =A0doAfterFlush(); >> @@ -1335,7 +1337,9 @@ public class IndexWriter implements Clos >> =A0 =A0 =A0 =A0 =A0anySegmentFlushed =3D docWriter.updateDocuments(docs,= analyzer, >> delTerm); >> =A0 =A0 =A0 =A0 =A0success =3D true; >> =A0 =A0 =A0 =A0} finally { >> - =A0 =A0 =A0 =A0infoStream.message("IW", "hit exception updating docume= nt"); >> + =A0 =A0 =A0 =A0if (!success && infoStream.isEnabled("IW")) { >> + =A0 =A0 =A0 =A0 =A0infoStream.message("IW", "hit exception updating do= cument"); >> + =A0 =A0 =A0 =A0} >> =A0 =A0 =A0 =A0} >> =A0 =A0 =A0 =A0if (anySegmentFlushed) { >> =A0 =A0 =A0 =A0 =A0maybeMerge(); >> @@ -1480,7 +1484,9 @@ public class IndexWriter implements Clos >> =A0 =A0 =A0 =A0 =A0anySegmentFlushed =3D docWriter.updateDocument(doc, a= nalyzer, term); >> =A0 =A0 =A0 =A0 =A0success =3D true; >> =A0 =A0 =A0 =A0} finally { >> - =A0 =A0 =A0 =A0infoStream.message("IW", "hit exception updating docume= nt"); >> + =A0 =A0 =A0 =A0if (!success && infoStream.isEnabled("IW")) { >> + =A0 =A0 =A0 =A0 =A0infoStream.message("IW", "hit exception updating do= cument"); >> + =A0 =A0 =A0 =A0} >> =A0 =A0 =A0 =A0} >> >> =A0 =A0 =A0 =A0if (anySegmentFlushed) { >> @@ -2043,7 +2049,9 @@ public class IndexWriter implements Clos >> =A0 =A0 =A0} catch (OutOfMemoryError oom) { >> =A0 =A0 =A0 =A0handleOOM(oom, "deleteAll"); >> =A0 =A0 =A0} finally { >> - =A0 =A0 =A0infoStream.message("IW", "hit exception during deleteAll"); >> + =A0 =A0 =A0if (!success && infoStream.isEnabled("IW")) { >> + =A0 =A0 =A0 =A0infoStream.message("IW", "hit exception during deleteAl= l"); >> + =A0 =A0 =A0} >> =A0 =A0 =A0} >> =A0 =A0} >> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org > For additional commands, e-mail: dev-help@lucene.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional commands, e-mail: dev-help@lucene.apache.org