svn commit: r1643897 - /lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

[mi...@apache.org]

Author: mikemccand
Date: Mon Dec  8 19:41:46 2014
New Revision: 1643897

URL: http://svn.apache.org/r1643897
Log:
LUCENE-6097: mark abort/waitForMerges deprecated

Modified:
    lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1643897&r1=1643896&r2=1643897&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Mon Dec  8 19:41:46 2014
@@ -2268,7 +2268,10 @@ public class IndexWriter implements Clos
 
   /** Aborts running merges.  Be careful when using this
    *  method: when you abort a long-running merge, you lose
-   *  a lot of work that must later be redone. */
+   *  a lot of work that must later be redone.
+   *
+   * @deprecated This will be removed in 5.0 */
+  @Deprecated
   public synchronized void abortMerges() {
     stopMerges = true;
 
@@ -2316,7 +2319,11 @@ public class IndexWriter implements Clos
    *
    * <p>It is guaranteed that any merges started prior to calling this method
    *    will have completed once this method completes.</p>
+   *
+   * @deprecated This will be removed in Lucene 5.x.  Interact with {@link ConcurrentMergeScheduler} if you really must know the specific
+   * timing of merges.
    */
+  @Deprecated
   public void waitForMerges() throws IOException {
 
     // Give merge scheduler last chance to run, in case