Fix bad integ

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 108276]

Author: thegridman

prj/coherence-core/src/main/java/com/tangosol/net/CoherenceConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -36,7 +36,7 @@ public interface CoherenceConfiguration
      */
     static Builder builder()
         {
-        return new Builder();
+        return new Builder().discoverSessions();
         }
 
     /**
@@ -115,6 +115,14 @@ default String getDefaultSessionName()
      */
     class Builder
         {
+        /**
+         * Create a {@link Builder}.
+         */
+        public Builder()
+            {
+            m_fDiscoverSessions = true;
+            }
+
         /**
          * Set the name of the {@link Coherence} instance.
          * <p>
@@ -166,7 +174,18 @@ public Builder withDefaultSession(String sName)
          */
         public Builder discoverSessions()
             {
-            withSessions(ServiceLoader.load(SessionConfiguration.class));
+            return discoverSessions(true);
+            }
+
+        /**
+         * Add all of the {@link SessionConfiguration} instances discovered
+         * using the {@link ServiceLoader}.
+         *
+         * @return  this {@link Builder}
+         */
+        public Builder discoverSessions(boolean f)
+            {
+            m_fDiscoverSessions = f;
             return this;
             }
 
@@ -188,6 +207,12 @@ public Builder discoverSessions()
          * @return  this {@link Builder}
          */
         public Builder withSession(SessionConfiguration config)
+            {
+            withSession(config, f_mapConfig);
+            return this;
+            }
+
+        private void withSession(SessionConfiguration config, Map<String, SessionConfiguration> map)
             {
             if (config != null && config.isEnabled())
                 {
@@ -196,9 +221,8 @@ public Builder withSession(SessionConfiguration config)
                     {
                     throw new IllegalArgumentException("A session configuration must provide a non-null name");
                     }
-                f_mapConfig.put(sName, config);
+                map.put(sName, config);
                 }
-            return this;
             }
 
         /**
@@ -320,12 +344,15 @@ public Builder withApplicationContext(Context context)
          */
         public CoherenceConfiguration build()
             {
-            if (Coherence.getInstance(m_sName) != null)
+            Map<String, SessionConfiguration> mapConfig = new HashMap<>();
+            if (m_fDiscoverSessions)
                 {
-                throw new IllegalStateException("A Coherence instance already exists with the name " + m_sName);
+                for (SessionConfiguration configuration : ServiceLoader.load(SessionConfiguration.class))
+                    {
+                    withSession(configuration, mapConfig);
+                    }
                 }
-
-            Map<String, SessionConfiguration> mapConfig = new HashMap<>(f_mapConfig);
+            mapConfig.putAll(f_mapConfig);
 
             if (mapConfig.isEmpty())
                 {
@@ -349,6 +376,11 @@ public CoherenceConfiguration build()
          */
         private String m_sDefaultSession = Coherence.DEFAULT_NAME;
 
+        /**
+         * A flag to determine whether to automatically discover session configurations.
+         */
+        private boolean m_fDiscoverSessions;
+
         /**
          * A map of named {@link SessionConfiguration} instances.
          */