You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by Uwe Schindler <uw...@thetaphi.de> on 2011/12/02 22:06:49 UTC
RE: svn commit: r1209663 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
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.java
>
> Author: mikemccand
> Date: Fri Dec 2 19:52:39 2011
> New Revision: 1209663
>
> URL: http://svn.apache.org/viewvc?rev=1209663&view=rev
> Log:
> LUCENE-3598: fix some accidental behaviour changes here...
>
> Modified:
>
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
>
> Modified:
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lu
> cene/index/IndexWriter.java?rev=1209663&r1=1209662&r2=1209663&view=di
> ff
> ================================================================
> ==============
> ---
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
> (original)
> +++
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
> Fri Dec 2 19:52:39 2011
> @@ -371,7 +371,9 @@ public class IndexWriter implements Clos
> // never reached but javac disagrees:
> return null;
> } finally {
> - infoStream.message("IW", "hit exception during NRT reader");
> + if (!success && infoStream.isEnabled("IW")) {
> + infoStream.message("IW", "hit exception during NRT reader");
> + }
> // Done: finish the full flush!
> docWriter.finishFullFlush(success);
> doAfterFlush();
> @@ -1335,7 +1337,9 @@ public class IndexWriter implements Clos
> anySegmentFlushed = docWriter.updateDocuments(docs, analyzer,
> delTerm);
> success = true;
> } finally {
> - infoStream.message("IW", "hit exception updating document");
> + if (!success && infoStream.isEnabled("IW")) {
> + infoStream.message("IW", "hit exception updating document");
> + }
> }
> if (anySegmentFlushed) {
> maybeMerge();
> @@ -1480,7 +1484,9 @@ public class IndexWriter implements Clos
> anySegmentFlushed = docWriter.updateDocument(doc, analyzer, term);
> success = true;
> } finally {
> - infoStream.message("IW", "hit exception updating document");
> + if (!success && infoStream.isEnabled("IW")) {
> + infoStream.message("IW", "hit exception updating document");
> + }
> }
>
> if (anySegmentFlushed) {
> @@ -2043,7 +2049,9 @@ public class IndexWriter implements Clos
> } catch (OutOfMemoryError oom) {
> handleOOM(oom, "deleteAll");
> } finally {
> - infoStream.message("IW", "hit exception during deleteAll");
> + if (!success && infoStream.isEnabled("IW")) {
> + infoStream.message("IW", "hit exception during deleteAll");
> + }
> }
> }
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1209663 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Posted by Michael McCandless <lu...@mikemccandless.com>.
No problem! Par for the course...
Mike McCandless
http://blog.mikemccandless.com
On Fri, Dec 2, 2011 at 4:06 PM, Uwe Schindler <uw...@thetaphi.de> 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.java
>>
>> Author: mikemccand
>> Date: Fri Dec 2 19:52:39 2011
>> New Revision: 1209663
>>
>> URL: http://svn.apache.org/viewvc?rev=1209663&view=rev
>> Log:
>> LUCENE-3598: fix some accidental behaviour changes here...
>>
>> Modified:
>>
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
>>
>> Modified:
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lu
>> cene/index/IndexWriter.java?rev=1209663&r1=1209662&r2=1209663&view=di
>> ff
>> ================================================================
>> ==============
>> ---
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
>> (original)
>> +++
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
>> Fri Dec 2 19:52:39 2011
>> @@ -371,7 +371,9 @@ public class IndexWriter implements Clos
>> // never reached but javac disagrees:
>> return null;
>> } finally {
>> - infoStream.message("IW", "hit exception during NRT reader");
>> + if (!success && infoStream.isEnabled("IW")) {
>> + infoStream.message("IW", "hit exception during NRT reader");
>> + }
>> // Done: finish the full flush!
>> docWriter.finishFullFlush(success);
>> doAfterFlush();
>> @@ -1335,7 +1337,9 @@ public class IndexWriter implements Clos
>> anySegmentFlushed = docWriter.updateDocuments(docs, analyzer,
>> delTerm);
>> success = true;
>> } finally {
>> - infoStream.message("IW", "hit exception updating document");
>> + if (!success && infoStream.isEnabled("IW")) {
>> + infoStream.message("IW", "hit exception updating document");
>> + }
>> }
>> if (anySegmentFlushed) {
>> maybeMerge();
>> @@ -1480,7 +1484,9 @@ public class IndexWriter implements Clos
>> anySegmentFlushed = docWriter.updateDocument(doc, analyzer, term);
>> success = true;
>> } finally {
>> - infoStream.message("IW", "hit exception updating document");
>> + if (!success && infoStream.isEnabled("IW")) {
>> + infoStream.message("IW", "hit exception updating document");
>> + }
>> }
>>
>> if (anySegmentFlushed) {
>> @@ -2043,7 +2049,9 @@ public class IndexWriter implements Clos
>> } catch (OutOfMemoryError oom) {
>> handleOOM(oom, "deleteAll");
>> } finally {
>> - infoStream.message("IW", "hit exception during deleteAll");
>> + if (!success && infoStream.isEnabled("IW")) {
>> + infoStream.message("IW", "hit exception during deleteAll");
>> + }
>> }
>> }
>>
>
>
>
> ---------------------------------------------------------------------
> 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