Sync with underscore-java.

Author: javadev

src/main/java/com/github/underscore/MemoizeFunction.java

@@ -33,9 +33,7 @@ public abstract class MemoizeFunction<F, T> implements Function<F, T> {
     public abstract T calc(final F n);
 
     public T apply(final F key) {
-        if (!cache.containsKey(key)) {
-            cache.put(key, calc(key));
-        }
+        cache.putIfAbsent(key, calc(key));
         return cache.get(key);
     }
 }

src/main/java/com/github/underscore/U.java

@@ -1945,7 +1945,7 @@ public byte[] blob() {
 
         public String text() {
             try {
-                return stream.toString("UTF-8");
+                return stream.toString(StandardCharsets.UTF_8.name());
             } catch (java.io.UnsupportedEncodingException ex) {
                 throw new UnsupportedOperationException(ex);
             }

src/main/java/com/github/underscore/Xml.java

@@ -1515,8 +1515,9 @@ private static String unescapeName(final String name) {
         StringBuilder result = new StringBuilder();
         int underlineCount = 0;
         StringBuilder lastChars = new StringBuilder();
+        int i = 0;
         outer:
-        for (int i = 0; i < length; ++i) {
+        while (i < length) {
             char ch = name.charAt(i);
             if (ch == '_') {
                 lastChars.append(ch);
@@ -1535,6 +1536,7 @@ private static String unescapeName(final String name) {
                                 i = j;
                                 underlineCount = 0;
                                 lastChars.setLength(0);
+                                i++;
                                 continue outer;
                             }
                         } else {
@@ -1546,6 +1548,7 @@ private static String unescapeName(final String name) {
                 result.append(lastChars).append(ch);
                 lastChars.setLength(0);
             }
+            i++;
         }
         return result.append(lastChars).toString();
     }