Return-Path: 
 <java-commits-return-2644-apmail-lucene-java-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-java-commits-archive@www.apache.org
Received: (qmail 70530 invoked from network); 6 Mar 2009 11:25:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Mar 2009 11:25:19 -0000
Received: (qmail 2596 invoked by uid 500); 6 Mar 2009 11:25:19 -0000
Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org
Received: (qmail 2571 invoked by uid 500); 6 Mar 2009 11:25:19 -0000
Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:java-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:java-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:java-commits@lucene.apache.org>
List-Id: <java-commits.lucene.apache.org>
Reply-To: java-dev@lucene.apache.org
Delivered-To: mailing list java-commits@lucene.apache.org
Received: (qmail 2562 invoked by uid 99); 6 Mar 2009 11:25:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 03:25:18 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 11:25:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D428C238899B; Fri,  6 Mar 2009 11:24:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r750851 -
 /lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java
Date: Fri, 06 Mar 2009 11:24:56 -0000
To: java-commits@lucene.apache.org
From: mikemccand@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090306112457.D428C238899B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mikemccand
Date: Fri Mar  6 11:24:55 2009
New Revision: 750851

URL: http://svn.apache.org/viewvc?rev=750851&view=rev
Log:
fix javadoc for addIndexes(IndexReader[]) to remove incorrect warning that a writer cannot be changing the underlying index

Modified:
    lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java?rev=750851&r1=750850&r2=750851&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java Fri Mar  6 11:24:55 2009
@@ -3340,12 +3340,6 @@
   /** Merges the provided indexes into this index.
    * <p>After this completes, the index is optimized. </p>
    * <p>The provided IndexReaders are not closed.</p>
-
-   * <p><b>NOTE:</b> the index in each Directory must not be
-   * changed (opened by a writer) while this method is
-   * running.  This method does not acquire a write lock in
-   * each input Directory, so it is up to the caller to
-   * enforce this.
    *
    * <p><b>NOTE:</b> while this is running, any attempts to
    * add or delete documents (with another thread) will be