--- old/src/java.base/share/classes/java/util/Scanner.java 2016-02-12 16:22:55.920328799 +0000 +++ new/src/java.base/share/classes/java/util/Scanner.java 2016-02-12 16:22:55.776331877 +0000 @@ -38,8 +38,6 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import sun.misc.LRUCache; - /** * A simple text scanner which can parse primitive types and strings using * regular expressions. @@ -366,15 +364,7 @@ private Locale locale = null; // A cache of the last few recently used Patterns - private LRUCache patternCache = - new LRUCache(7) { - protected Pattern create(String s) { - return Pattern.compile(s); - } - protected boolean hasName(Pattern p, String s) { - return p.pattern().equals(s); - } - }; + private PatternLRUCache patternCache = new PatternLRUCache(7); // A holder of the last IOException encountered private IOException lastException; @@ -2838,4 +2828,50 @@ } } } + + /** Utility class for small LRU caches. */ + private static class PatternLRUCache { + + private Pattern[] oa = null; + private final int size; + + PatternLRUCache(int size) { + this.size = size; + } + + boolean hasName(Pattern p, String s) { + return p.pattern().equals(s); + } + + void moveToFront(Object[] oa, int i) { + Object ob = oa[i]; + for (int j = i; j > 0; j--) + oa[j] = oa[j - 1]; + oa[0] = ob; + } + + Pattern forName(String name) { + if (oa == null) { + Pattern[] temp = new Pattern[size]; + oa = temp; + } else { + for (int i = 0; i < oa.length; i++) { + Pattern ob = oa[i]; + if (ob == null) + continue; + if (hasName(ob, name)) { + if (i > 0) + moveToFront(oa, i); + return ob; + } + } + } + + // Create a new object + Pattern ob = Pattern.compile(name); + oa[oa.length - 1] = ob; + moveToFront(oa, oa.length - 1); + return ob; + } + } }