using the framework correctly for indexer

Author: tulinkry

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerFramework.java

@@ -189,6 +189,8 @@ protected void classLoaded(AnalyzersInfo localInfo, IAnalyzerPlugin plugin) {
         if (analyzer.getName() != null && !analyzer.getName().isEmpty()) {
             localInfo.fileTypeDescriptions.put(analyzer.getAnalyzer().getFileTypeName(), analyzer.getName());
         }
+
+        LOGGER.log(Level.INFO, "An analyzer factory {0} has been loaded.", analyzer.getClass().getCanonicalName());
     }
 
     /**

opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java

@@ -28,8 +28,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
@@ -44,7 +44,7 @@
 public class PluginClassLoader extends ClassLoader {
 
     @SuppressWarnings("rawtypes")
-    private final Map<String, Class> cache = new HashMap<>();
+    private final Map<String, Class> cache = new ConcurrentHashMap<>();
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PluginClassLoader.class);
     private static final String[] CLASS_WHITELIST = new String[]{
@@ -232,8 +232,6 @@ public Class loadClass(String name, boolean resolveIt) throws ClassNotFoundExcep
             return c;
         }
 
-        checkClassname(name);
-
         // find already loaded class
         if ((c = findLoadedClass(name)) != null) {
             cache.put(name, c);
@@ -257,6 +255,8 @@ public Class loadClass(String name, boolean resolveIt) throws ClassNotFoundExcep
             }
         }
 
+        checkClassname(name);
+
         try {
             checkPackage(name);
             // load it from file

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

@@ -317,7 +317,7 @@ private void initialize() throws IOException {
             indexDirectory = FSDirectory.open(indexDir.toPath(), lockfact);
             ignoredNames = env.getIgnoredNames();
             includedNames = env.getIncludedNames();
-            analyzerGuru = new AnalyzerGuru();
+            analyzerGuru = env.getAnalyzerGuru();
             xrefDir = new File(env.getDataRootFile(), XREF_DIR);
             listeners = new CopyOnWriteArrayList<>();
             dirtyFile = new File(indexDir, "dirty");