Issue/85 (#86)

* Reenable test

* Cleanup usage of raw types

* Fix flaky test. Fix #85

Author: minborg

src/main/java/net/openhft/compiler/CachedCompiler.java

@@ -42,7 +42,7 @@ public class CachedCompiler implements Closeable {
     private static final Logger LOG = LoggerFactory.getLogger(CachedCompiler.class);
     private static final PrintWriter DEFAULT_WRITER = new PrintWriter(System.err);
 
-    private final Map<ClassLoader, Map<String, Class>> loadedClassesMap = Collections.synchronizedMap(new WeakHashMap<>());
+    private final Map<ClassLoader, Map<String, Class<?>>> loadedClassesMap = Collections.synchronizedMap(new WeakHashMap<>());
     private final Map<ClassLoader, MyJavaFileManager> fileManagerMap = Collections.synchronizedMap(new WeakHashMap<>());
 
     @Nullable
@@ -130,12 +130,12 @@ public Class loadFromJava(@NotNull ClassLoader classLoader,
                               @NotNull String className,
                               @NotNull String javaCode,
                               @Nullable PrintWriter writer) throws ClassNotFoundException {
-        Class clazz = null;
-        Map<String, Class> loadedClasses;
+        Class<?> clazz = null;
+        Map<String, Class<?>> loadedClasses;
         synchronized (loadedClassesMap) {
             loadedClasses = loadedClassesMap.get(classLoader);
             if (loadedClasses == null)
-                loadedClassesMap.put(classLoader, loadedClasses = new LinkedHashMap<String, Class>());
+                loadedClassesMap.put(classLoader, loadedClasses = new LinkedHashMap<>());
             else
                 clazz = loadedClasses.get(className);
         }

src/main/java/net/openhft/compiler/MyJavaFileManager.java

@@ -71,11 +71,15 @@ class MyJavaFileManager implements JavaFileManager {
         this.fileManager = fileManager;
     }
 
-    public Iterable<Set<Location>> listLocationsForModules(final Location location) {
+    // Apparently, this method might not be thread-safe.
+    // See https://github.com/OpenHFT/Java-Runtime-Compiler/issues/85
+    public synchronized Iterable<Set<Location>> listLocationsForModules(final Location location) {
         return invokeNamedMethodIfAvailable(location, "listLocationsForModules");
     }
 
-    public String inferModuleName(final Location location) {
+    // Apparently, this method might not be thread-safe.
+    // See https://github.com/OpenHFT/Java-Runtime-Compiler/issues/85
+    public synchronized String inferModuleName(final Location location) {
         return invokeNamedMethodIfAvailable(location, "inferModuleName");
     }
 

src/test/java/mytest/RuntimeCompileTest.java

@@ -42,7 +42,7 @@ public void outOfBounds() throws Exception {
         }
     }
 
-    @Ignore("see https://teamcity.chronicle.software/viewLog.html?buildId=639347&tab=buildResultsDiv&buildTypeId=OpenHFT_BuildAll_BuildJava11compileJava11")
+    //@Ignore("see https://teamcity.chronicle.software/viewLog.html?buildId=639347&tab=buildResultsDiv&buildTypeId=OpenHFT_BuildAll_BuildJava11compileJava11")
     @Test
     public void testMultiThread() throws Exception {
         StringBuilder largeClass = new StringBuilder("package mytest;\n" +
@@ -64,6 +64,7 @@ public void testMultiThread() throws Exception {
         final ClassLoader cl = new URLClassLoader(new URL[0]);
         final CachedCompiler cc = new CachedCompiler(null, null);
         final int nThreads = Runtime.getRuntime().availableProcessors();
+        System.out.println("nThreads = " + nThreads);
         final AtomicInteger started = new AtomicInteger(0);
         final ExecutorService executor = Executors.newFixedThreadPool(nThreads);
         final List<Future<?>> futures = new ArrayList<>();