(ignite) branch master updated: IGNITE-20744 StandaloneContext should not load plugins from classpath (#11017)

[nizhikov]

This is an automated email from the ASF dual-hosted git repository.

nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 7c11d93729d IGNITE-20744 StandaloneContext should not load plugins 
from classpath (#11017)
7c11d93729d is described below

commit 7c11d93729d97497dafe34ec66221fd77bacf05f
Author: Anton Vinogradov <a...@apache.org>
AuthorDate: Fri Oct 27 19:31:00 2023 +0300

    IGNITE-20744 StandaloneContext should not load plugins from classpath 
(#11017)
---
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java    | 2 +-
 .../persistence/wal/reader/StandaloneIgnitePluginProcessor.java   | 2 +-
 .../main/java/org/apache/ignite/internal/util/IgniteUtils.java    | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 0cafc69d0c4..fb227c583d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -918,7 +918,7 @@ public class IgniteKernal implements IgniteEx, 
Externalizable {
                 throw new IgniteCheckedException("User attribute has illegal 
name: '" + name + "'. Note that all names " +
                     "starting with '" + ATTR_PREFIX + "' are reserved for 
internal use.");
 
-        List<PluginProvider> plugins = U.allPluginProviders(cfg);
+        List<PluginProvider> plugins = U.allPluginProviders(cfg, true);
 
         // Spin out SPIs & managers.
         try {
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
index 5ad46234811..ab142826ff9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
@@ -32,6 +32,6 @@ class StandaloneIgnitePluginProcessor extends 
IgnitePluginProcessor {
      * @param cfg Ignite configuration.
      */
     StandaloneIgnitePluginProcessor(GridKernalContext ctx, IgniteConfiguration 
cfg) throws IgniteCheckedException {
-        super(ctx, cfg, U.allPluginProviders(cfg));
+        super(ctx, cfg, U.allPluginProviders(cfg, false));
     }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 660a8924550..2f736091ed1 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -1095,11 +1095,15 @@ public abstract class IgniteUtils {
      * Gets all plugin providers.
      *
      * @param cfg Configuration.
+     * @param includeClsPath Include classpath plugins on empty config.
      * @return Plugins.
      */
-    public static List<PluginProvider> allPluginProviders(IgniteConfiguration 
cfg) {
+    public static List<PluginProvider> allPluginProviders(IgniteConfiguration 
cfg, boolean includeClsPath) {
         return cfg.getPluginProviders() != null && 
cfg.getPluginProviders().length > 0 ?
-            Arrays.asList(cfg.getPluginProviders()) : U.allPluginProviders();
+            Arrays.asList(cfg.getPluginProviders()) :
+            includeClsPath ?
+                U.allPluginProviders() :
+                Collections.emptyList();
     }
 
     /**