[CONJ-1054] race condition when using CredentialPlugin

mariadb-corporation · Mar 2, 2023 · c94cf0d · c94cf0d
1 parent 016a211
commit c94cf0d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/plugin/credential/CredentialPluginLoader.java b/src/main/java/org/mariadb/jdbc/plugin/credential/CredentialPluginLoader.java
@@ -15,9 +15,6 @@
  */
 public final class CredentialPluginLoader {
 
-  private static final ServiceLoader<CredentialPlugin> loader =
-      ServiceLoader.load(CredentialPlugin.class, Driver.class.getClassLoader());
-
   /**
    * Get current Identity plugin according to option `identityType`.
    *
@@ -28,6 +25,9 @@ public final class CredentialPluginLoader {
   public static CredentialPlugin get(String type) throws SQLException {
     if (type == null) return null;
 
+    ServiceLoader<CredentialPlugin> loader =
+        ServiceLoader.load(CredentialPlugin.class, Driver.class.getClassLoader());
+
     for (CredentialPlugin implClass : loader) {
       if (type.equals(implClass.type())) {
         return implClass;