Skip to content

Commit 90dde25

Browse files
authored
Revert ConfigurationException due to binary incompatibility (#6201)
* Revert ConfigurationException due to binary incompatibility * Update API Verify list
1 parent 79c652f commit 90dde25

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.verified.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2239,7 +2239,7 @@ namespace Akka.Configuration
22392239
public ConfigurationException(string message) { }
22402240
public ConfigurationException(string message, System.Exception exception) { }
22412241
protected ConfigurationException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
2242-
public static Akka.Configuration.ConfigurationException NullOrEmptyConfig<T>(string path = null, string reason = null) { }
2242+
public static Akka.Configuration.ConfigurationException NullOrEmptyConfig<T>(string path = null) { }
22432243
}
22442244
public class ConfigurationFactory
22452245
{

src/core/Akka.Cluster/ClusterSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ClusterSettings(Config config, string systemName)
3535
//TODO: Requiring!
3636
var clusterConfig = config.GetConfig("akka.cluster");
3737
if (clusterConfig?.GetConfig("failure-detector") == null)
38-
throw ConfigurationException.NullOrEmptyConfig<ClusterSettings>("akka.cluster", "Did you forgot to set the 'akka.cluster.provider' HOCON property to 'cluster'?");
38+
throw new ConfigurationException($"Failed to instantiate {nameof(ClusterSettings)}: Configuration does not contain `akka.cluster` node. Did you forgot to set the 'akka.cluster.provider' HOCON property to 'cluster'?");
3939

4040
LogInfoVerbose = clusterConfig.GetBoolean("log-info-verbose", false);
4141
LogInfo = LogInfoVerbose || clusterConfig.GetBoolean("log-info", false);

src/core/Akka/Configuration/ConfigurationException.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ namespace Akka.Configuration
1616
/// </summary>
1717
public class ConfigurationException : AkkaException
1818
{
19-
public static ConfigurationException NullOrEmptyConfig<T>(string path = null, string reason = null)
19+
public static ConfigurationException NullOrEmptyConfig<T>(string path = null)
2020
{
2121
if (!string.IsNullOrWhiteSpace(path))
22-
return new ConfigurationException($"Failed to instantiate {typeof(T).Name}: Configuration does not contain `{path}` node{(reason != null ? $". {reason}" : "")}");
23-
return new ConfigurationException($"Failed to instantiate {typeof(T).Name}: Configuration is null or empty{(reason != null ? $". {reason}" : "")}");
22+
return new ConfigurationException($"Failed to instantiate {typeof(T).Name}: Configuration does not contain `{path}` node");
23+
return new ConfigurationException($"Failed to instantiate {typeof(T).Name}: Configuration is null or empty");
2424
}
2525

2626
/// <summary>

0 commit comments

Comments
 (0)