From 681f24ca8a74ea6728773f22b4abde26344a4b93 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Sat, 16 Mar 2013 18:03:13 +0000
Subject: [PATCH] LUCENE-4839: Javadocs links, prevent synthetic accessor
 method access$0() for merge()

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1457284 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/java/org/apache/lucene/util/SorterTemplate.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/util/SorterTemplate.java b/lucene/core/src/java/org/apache/lucene/util/SorterTemplate.java
index 435b09ae59d..af877a9c00e 100644
--- a/lucene/core/src/java/org/apache/lucene/util/SorterTemplate.java
+++ b/lucene/core/src/java/org/apache/lucene/util/SorterTemplate.java
@@ -313,8 +313,8 @@ public abstract class SorterTemplate {
 
   }
 
-  /** Sorts using TimSort, see http://svn.python.org/projects/python/trunk/Objects/listsort.txt
-   *  and http://svn.python.org/projects/python/trunk/Objects/listobject.c.
+  /** Sorts using <a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">TimSort</a>, see 
+   *  also <a href="http://svn.python.org/projects/python/trunk/Objects/listobject.c">source code</a>.
    *  TimSort is a stable sorting algorithm based on MergeSort but known to
    *  perform extremely well on partially-sorted inputs.
    *  For small collections, falls back to {@link #binarySort(int, int)}. */
@@ -343,7 +343,8 @@ public abstract class SorterTemplate {
     merge(lo, mid, hi, mid - lo, hi - mid);
   }
 
-  private void merge(int lo, int pivot, int hi, int len1, int len2) {
+  // pkg-protected for access from TimSort class
+  void merge(int lo, int pivot, int hi, int len1, int len2) {
     if (len1 == 0 || len2 == 0) {
       return;
     }