Fixed map concurrency bug in TypeFunctions.

Author: rwperrott

pom.xml

@@ -15,10 +15,10 @@
 
     <groupId>rwperrott</groupId>
     <artifactId>rwperrott-string-template-utils</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3</version>
     <packaging>jar</packaging>
 
-    <name>StringTemplate Utils</name>
+    <name>${project.artifactId}:%{project.version}</name>
 
     <dependencies>
         <dependency>

src/main/java/rwperrott/stringtemplate/v4/TypeFunctions.java

@@ -35,16 +35,12 @@ private static class ByName extends Object2ObjectAVLTreeMap<String, MemberInvoke
         private final Class<?> valueType;
 
         @SuppressWarnings("LeakingThisInConstructor")
-        private ByName(final Class<?> valueType) {
+        private ByName(final Class<?> valueType, final ByName superInstance) {
             dejaVu.add(valueType);
             this.valueType = valueType;
             ClassMembers.of(valueType).addTo(this);
-            // Shouldn't need to do this!
-            final Class<?> superType = valueType.getSuperclass();
-            if (null != superType) {
-                ByName parent = FOR_TYPE.computeIfAbsent(superType, ByName::new);
-                final ObjectSet<MemberInvoker> unique = new ObjectOpenHashSet<>();
-                mergeInstanceInvokers(unique, parent);
+            if (null != superInstance) {
+                mergeInstanceInvokers(new ObjectOpenHashSet<>(), superInstance);
             }
         }
 
@@ -130,9 +126,23 @@ public static void registerFunctionClasses(Class<?> valueType, Class<?>... funct
             }
     }
 
+    private static ByName get0(Class<?> valueType) {
+        // Have to split get and put to avoid ConcurrentModificationException.
+        ByName byName = FOR_TYPE.get(valueType);
+        if (null != byName)
+            return byName;
+        ByName superInstance = null;
+        final Class<?> superType = valueType.getSuperclass();
+        if (null != superType) {
+            superInstance = get0(superType);
+        }
+        FOR_TYPE.put(valueType, byName = new ByName(valueType, superInstance));
+        return byName;
+    }
+
     private static ByName get(Class<?> valueType) {
         synchronized (FOR_TYPE) {
-            return FOR_TYPE.computeIfAbsent(valueType, ByName::new);
+            return get0(valueType);
         }
     }
 

src/test/java/rwperrott/stringtemplate/v4/TypeFunctionsTest.java

@@ -0,0 +1,19 @@
+package rwperrott.stringtemplate.v4;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+public class TypeFunctionsTest {
+    @Test
+    public void test() {
+        try {
+            new StringInvokeRenderer();
+            new ObjectInvokeAdaptor();
+            new StringInvokeAdaptor();
+        } catch (Throwable t) {
+            t.printStackTrace();
+            fail("failed",t);
+        }
+    }
+}