svn commit: r1440143 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java

[mi...@apache.org]

Author: mikemccand
Date: Tue Jan 29 21:21:16 2013
New Revision: 1440143

URL: http://svn.apache.org/viewvc?rev=1440143&view=rev
Log:
LUCENE-4735: workaround IBM J9 JVM bug

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/test-framework/   (props changed)
    lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java

Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java?rev=1440143&r1=1440142&r2=1440143&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java Tue Jan 29 21:21:16 2013
@@ -19,6 +19,7 @@ package org.apache.lucene.analysis;
 
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -89,8 +90,8 @@ public class MockCharFilter extends Char
 
   @Override
   public int correct(int currentOff) {
-    SortedMap<Integer,Integer> subMap = corrections.subMap(0, currentOff+1);
-    int ret = subMap.isEmpty() ? currentOff : currentOff + subMap.get(subMap.lastKey());
+    Map.Entry<Integer,Integer> lastEntry = corrections.lowerEntry(currentOff+1);
+    int ret = lastEntry == null ? currentOff : currentOff + lastEntry.getValue();
     assert ret >= 0 : "currentOff=" + currentOff + ",diff=" + (ret-currentOff);
     return ret;
   }